version 4.3.0

TODO: add precision to invert and test vector

.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

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

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,12 +1,12 @@
 cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0017 NEW) # need include() with .cmake
-project(pip)
+project(PIP)
-set(pip_MAJOR    2)
+set(PIP_MAJOR    4)
-set(pip_MINOR    39)
+set(PIP_MINOR    3)
-set(pip_REVISION 0)
+set(PIP_REVISION 0)
-set(pip_SUFFIX   )
+set(PIP_SUFFIX   )
-set(pip_COMPANY  SHS)
+set(PIP_COMPANY  SHS)
-set(pip_DOMAIN   org.SHS)
+set(PIP_DOMAIN   org.SHS)
 
 set(GIT_CMAKE_DIR)
 if (NOT DEFINED SHSTKPROJECT)
@@ -17,7 +17,7 @@ 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_REPOSITORY    https://git.shstk.ru/SHS/cmake.git
 	GIT_TAG           \"origin/master\"
 	GIT_CONFIG        \"advice.detachedHead=false\"
 	SOURCE_DIR        \"${CMAKE_CURRENT_BINARY_DIR}/cmake-src\"
@@ -53,7 +53,8 @@ include(CheckFunctionExists)
 include(PIPMacros)
 include(SHSTKMacros)
 
-shstk_begin_project(pip PIP)
+shstk_begin_project(PIP)
+set(PIP_VERSION "${PIP_VERSION}" CACHE STRING "")
 
 set(_ICU_DEFAULT OFF)
 if((NOT DEFINED WIN32) AND (NOT DEFINED ANDROID_PLATFORM) AND (NOT DEFINED APPLE))
@@ -61,17 +62,28 @@ 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(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_CXX_STANDARD 11)
 
+shstk_is_parent_exists(_pe)
+if (_pe)
+	set(BUILDING_pip 1 PARENT_SCOPE)
+	set(pip_ROOT_SRC "${CMAKE_CURRENT_SOURCE_DIR}" PARENT_SCOPE)
+endif()
+
 
 # Basic
 set(PIP_MODULES)
@@ -84,7 +96,7 @@ set(PIP_UTILS_LIST)
 set(PIP_TESTS_LIST)
 set(PIP_EXPORTS)
 
-set(PIP_SRC_MODULES "console;crypt;compress;usb;fftw;opencl;io_utils;cloud;lua")
+set(PIP_SRC_MODULES "console;crypt;compress;usb;fftw;opencl;io_utils;client_server;cloud;lua")
 foreach(_m ${PIP_SRC_MODULES})
 	set(PIP_MSG_${_m} "no")
 endforeach()
@@ -96,7 +108,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})
@@ -105,9 +117,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")
@@ -118,11 +135,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)
+	import_version(${_target} PIP)
-	set_deploy_property(${_target} ${pip_LIB_TYPE}
+	set_deploy_property(${_target} ${PIP_LIB_TYPE}
 		LABEL "${LABEL}"
-		FULLNAME "${pip_DOMAIN}.${_target}"
+		FULLNAME "${PIP_DOMAIN}.${_target}"
-		COMPANY  "${pip_COMPANY}"
+		COMPANY  "${PIP_COMPANY}"
 		INFO "Platform-Independent Primitives")
 	make_rc(${_target} _RC)
 
@@ -139,7 +156,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)
@@ -234,26 +251,11 @@ if(PIP_MATH_YN)
 	add_definitions(-DPIP_MATH_YN)
 endif()
 
-
-# Check if RT timers exists
-set(CMAKE_REQUIRED_INCLUDES time.h)
-set(CMAKE_REQUIRED_LIBRARIES )
-if((NOT DEFINED ENV{QNX_HOST}) AND (NOT APPLE) AND (NOT WIN32) AND (NOT DEFINED ANDROID_PLATFORM) AND (NOT PIP_FREERTOS))
-	list(APPEND LIBS_MAIN rt)
-	set(CMAKE_REQUIRED_LIBRARIES rt)
-endif()
-CHECK_FUNCTION_EXISTS(timer_create  PIP_TIMER_RT_0)
-CHECK_FUNCTION_EXISTS(timer_settime PIP_TIMER_RT_1)
-CHECK_FUNCTION_EXISTS(timer_delete  PIP_TIMER_RT_2)
-
-
 # Check if build debug version
-if (CMAKE_BUILD_TYPE MATCHES Debug)
+if (PIP_BUILD_DEBUG)
-	set(PIP_BUILD_TYPE "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()
 
@@ -307,15 +309,6 @@ list(APPEND HDRS ${_PIP_DEFS_FILE})
 #message("${_PIP_DEFS_CHANGED}")
 
 
-# Check if RT timers exists
-if(PIP_TIMER_RT_0 AND PIP_TIMER_RT_1 AND PIP_TIMER_RT_2)
-	set(PIP_TIMERS "Thread, ThreadRT, Pool")
-	add_definitions(-DPIP_TIMER_RT)
-else()
-	set(PIP_TIMERS "Thread, Pool")
-endif()
-
-
 
 # Add main library
 if(APPLE)
@@ -326,6 +319,7 @@ if ((NOT DEFINED SHSTKPROJECT) AND (DEFINED ANDROID_PLATFORM))
 	#message("${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include")
 	#message("${ANDROID_NDK}/sysroot/usr/include")
 endif()
+
 if(NOT PIP_FREERTOS)
 	if(WIN32)
 		if(${C_COMPILER} STREQUAL "cl.exe")
@@ -339,6 +333,9 @@ else()
 		else()
 			if (NOT DEFINED ANDROID_PLATFORM)
 				list(APPEND LIBS_MAIN pthread util)
+				if (NOT APPLE)
+					list(APPEND LIBS_MAIN rt)
+				endif()
 			endif()
 		endif()
 	endif()
@@ -399,6 +396,7 @@ if (NOT CROSSTOOLS)
 		pip_find_lib(sodium)
 		if(sodium_FOUND)
 			pip_module(crypt "sodium" "PIP crypt support" "" "" "")
+			pip_module(client_server "pip_io_utils" "PIP client-server helper" "" "" "")
 			pip_module(cloud "pip_io_utils" "PIP cloud support" "" "" "")
 		endif()
 
@@ -448,17 +446,16 @@ if (NOT CROSSTOOLS)
 		endif()
 
 
+		if (NOT "x${MINGW_INCLUDE}" STREQUAL "x")
+			list(APPEND CMAKE_INCLUDE_PATH "${MINGW_INCLUDE}")
+		endif()
 		find_package(OpenCL QUIET) #OpenCL_VERSION_STRING
 		if(OpenCL_FOUND)
-			set(_opencl_lib OpenCL::OpenCL)
-			if(${CMAKE_VERSION} VERSION_LESS "3.7.0")
-				target_link_libraries(_opencl_lib OpenCL)
-			endif()
 			set(_opencl_inc "${OpenCL_INCLUDE_DIRS}")
 			if(APPLE)
 				set(_opencl_inc "${OpenCL_INCLUDE_DIRS}/Headers")
 			endif()
-			pip_module(opencl "${_opencl_lib}" "PIP OpenCL support" "${_opencl_inc}" "" " (${OpenCL_VERSION_STRING})")
+			pip_module(opencl "OpenCL" "PIP OpenCL support" "${_opencl_inc}" "" " (${OpenCL_VERSION_STRING})")
 		endif()
 
 
@@ -481,14 +478,18 @@ 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")
+
+			#add_library(pip_plugin SHARED "test_plugin.h" "test_plugin.cpp" "ccm.h" "ccm.cpp")
 			#target_link_libraries(pip_plugin pip)
 
 			add_executable(pip_test "main.cpp")
-			target_link_libraries(pip_test pip)
+			target_link_libraries(pip_test pip pip_io_utils pip_client_server)
+			if(sodium_FOUND)
+				add_executable(pip_cloud_test "main_picloud_test.cpp")
+				target_link_libraries(pip_cloud_test pip_cloud)
+			endif()
 		endif()
 
 	else()
@@ -562,6 +563,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")
@@ -588,18 +590,18 @@ if ((NOT PIP_FREERTOS) AND (NOT CROSSTOOLS))
 	find_package(Doxygen)
 	if(DOXYGEN_FOUND)
 		set(DOXY_DEFINES "${PIP_EXPORTS}")
-		foreach (_m "console" "usb" "compress" "crypt" "cloud" "fftw" "opencl" "io_utils" "lua")
+		foreach (_m "console" "usb" "compress" "crypt" "client_server" "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_PROJECT_NUMBER "${PIP_VERSION}")
-		set(DOXY_QHP_CUST_FILTER_ATTRS "\"PIP ${pip_VERSION}\"")
+		set(DOXY_QHP_CUST_FILTER_ATTRS "\"PIP ${PIP_VERSION}\"")
-		set(DOXY_QHP_SECT_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")
+		set(DOXY_DOMAIN "${PIP_DOMAIN}.${PROJECT_NAME}.doc")
 		if ("x${DOC_LANG}" STREQUAL "x")
 			set(DOXY_OUTPUT_LANGUAGE English)
 			set(DOXY_OUTPUT_DIR      en)
@@ -645,9 +647,9 @@ endmacro()
 
 list(REMOVE_ITEM LIBS_STATUS ${PIP_MODULES})
 message("----------PIP----------")
-message(" Version: ${pip_VERSION} ")
+message(" Version: ${PIP_VERSION} ")
-message(" Linkage: ${pip_LIB_TYPE_MSG}")
+message(" Linkage: ${PIP_LIB_TYPE_MSG}")
-message(" Type   : ${pip_BUILD_TYPE}")
+message(" Type   : ${CMAKE_BUILD_TYPE}")
 if (NOT LOCAL)
 	message(" Install: \"${CMAKE_INSTALL_PREFIX}\"")
 else()
@@ -659,7 +661,6 @@ message("")
 message(" Options:")
 message("  std::iostream: ${PIP_STD_IOSTREAM}")
 message("  ICU strings  : ${PIP_ICU}")
-message("  Timer types  : ${PIP_TIMERS}")
 message("  Introspection: ${PIP_INTROSPECTION}")
 message("  Coverage     : ${PIP_COVERAGE}")
 if(INTROSPECTION)

README.md

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

cmake/FindPIP.cmake

@@ -9,6 +9,7 @@ Create imported targets:
   * PIP::FFTW
   * PIP::OpenCL
   * PIP::IOUtils
+  * PIP::ClientServer
   * PIP::Cloud
   * PIP::Lua
 
@@ -20,16 +21,11 @@ main library
 cmake_policy(SET CMP0011 NEW) # don`t affect includer policies
 include(SHSTKMacros)
 
-shstk_set_find_dirs(pip)
+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()
 
-set(__libs "usb;crypt;console;fftw;compress;io_utils;opencl;cloud;lua")
+set(__libs "usb;crypt;console;fftw;compress;opencl;io_utils;client_server;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 +36,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_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_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_DEPLOY_TOOL deploy_tool${PIP_BINEXT} HINTS ${PIP_BINDIR} ${PIP_FIND_PROGRAM_ARG})
 endif()
 if (NOT PIP_LIBRARY)
 	if(PIP_FIND_REQUIRED)
@@ -63,7 +59,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})
@@ -80,9 +76,9 @@ if (NOT BUILDING_pip)
 	endif()
 endif()
 
-if (NOT BUILDING_pip)
+if (NOT BUILDING_PIP)
-	shstk_find_header(pip PIP "pip_version.h" "${_PIP_LIBRARY_PATH_}")
+	shstk_find_header(PIP "pip_version.h" "${_PIP_LIBRARY_PATH_}")
-	set(PIP_INCLUDES "${pip_INCLUDES}" CACHE STRING "")
+	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!")
@@ -95,6 +91,7 @@ set(__module_fftw      FFTW     )
 set(__module_compress       Compress    )
 set(__module_opencl         OpenCL      )
 set(__module_io_utils       IOUtils     )
+set(__module_client_server  ClientServer)
 set(__module_cloud          Cloud       )
 set(__module_lua            Lua         )
 
@@ -105,13 +102,14 @@ foreach (_l ${__libs})
 endforeach()
 
 set(__deps_io_utils      "PIP::Crypt"  )
+set(__deps_client_server "PIP::IOUtils")
 set(__deps_cloud         "PIP::IOUtils")
 
 
-if (BUILDING_pip)
+if (BUILDING_PIP)
 
-	if (NOT SET_TARGETS_pip)
+	if (NOT SET_TARGETS_PIP)
-		set(SET_TARGETS_pip ON CACHE BOOL "")
+		set(SET_TARGETS_PIP ON CACHE BOOL "")
 		#message("create aliases")
 		if((NOT TARGET PIP) AND PIP_LIBRARY)
 			#message("alias PIP = pip")
@@ -133,7 +131,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()

doc/Doxyfile.in

@@ -2282,7 +2282,7 @@ EXTERNAL_GROUPS        = YES
 # be listed.
 # The default value is: YES.
 
-EXTERNAL_PAGES         = YES
+EXTERNAL_PAGES         = NO
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool

doc/examples/pichunkstream.cpp

@@ -9,8 +9,14 @@ struct S {
 };
 
 // Operators
-PIByteArray & operator <<(PIByteArray & b, const S & s) {b << s.i << s.f << s.s; return b;}
+PIByteArray & operator<<(PIByteArray & b, const S & s) {
-PIByteArray & operator >>(PIByteArray & b, S & s) {b >> s.i >> s.f >> s.s; return b;}
+	b << s.i << s.f << s.s;
+	return b;
+}
+PIByteArray & operator>>(PIByteArray & b, S & s) {
+	b >> s.i >> s.f >> s.s;
+	return b;
+}
 //! [struct]
 //! [write]
 // Write chunk stream
@@ -22,10 +28,7 @@ PIVector<float> f;
 f << -1. << 2.5 << 11.;
 // write some data to empty stream
 PIChunkStream cs;
-cs << cs.chunk(1, int(10))
+cs << cs.chunk(1, int(10)) << cs.chunk(2, PIString("text")) << cs.chunk(4, f) << cs.chunk(3, s);
-   << cs.chunk(2, PIString("text"))
-   << cs.chunk(4, f)
-   << cs.chunk(3, s);
 // now you can take cs.data() and send or place it somewhere ...
 //! [write]
 //! [read]
@@ -62,6 +65,6 @@ PIByteArray & operator >>(PIByteArray & s, S & value) {
 	if (!cs.extract(s)) return s;
 	cs.readAll();
 	cs.get(1, value.i).get(2, value.f).get(3, value.s);
-	return b;
+	return s;
 }
 //! [read_new]

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

@@ -7,19 +7,19 @@ class SomeIO: public PIIODevice {
 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;
 	}
-	void configureFromFullPath(const PIString & full_path) {
+	void configureFromFullPathDevice(const PIString & full_path) override {
 		// parse full_path and configure device here
 	}
 };
@@ -38,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/pitimer.cpp

@@ -1,10 +1,10 @@
 #include "pip.h"
 
 //! [delimiter]
-void tfunc(void * , int delim) {
+void tfunc(int delim) {
 	piCout << "tick with delimiter" << delim;
 };
-void tfunc4(void * , int delim) {
+void tfunc4(int delim) {
 	piCout << "tick4 with delimiter" << delim;
 };
 int main() {
@@ -13,8 +13,7 @@ int main() {
 	timer.addDelimiter(4, tfunc4);
 	timer.start(50);
 	piMSleep(200);
-	timer.stop();
+	timer.stopAndWait();
-	timer.waitForFinish();
 	return 0;
 };
 /* Result:
@@ -29,14 +28,14 @@ tick4 with delimiter 4
 //! [delimiter]
 //! [elapsed]
 int main() {
-	PITimer timer;
+	PITimeMeasurer tm;
 	piMSleep(100);
-	piCout << "elapsed" << timer.elapsed_m() << "ms";
+	piCout << "elapsed" << tm.elapsed_m() << "ms";
 	piMSleep(100);
-	piCout << "elapsed" << timer.elapsed_m() << "ms";
+	piCout << "elapsed" << tm.elapsed_m() << "ms";
-	timer.reset();
+	tm.reset();
 	piMSleep(150);
-	piCout << "elapsed" << timer.elapsed_s() << "s";
+	piCout << "elapsed" << tm.elapsed_s() << "s";
 	return 0;
 };
 /* Result:
@@ -53,9 +52,9 @@ int main() {
 	t0 -= PISystemTime::fromSeconds(0.1); // s = 1, ns = 0
 	t0.sleep();                           // sleep for 1 second
 	PISystemTime t1;
-	t0 = currentSystemTime();
+	t0 = PISystemTime::current();
 	piMSleep(500);
-	t1 = currentSystemTime();
+	t1 = PISystemTime::current();
 	(t1 - t0).sleep(); // sleep for 500 milliseconds
 	return 0;
 };
@@ -64,5 +63,4 @@ int main() {
 void _(){
 
 
-
 };

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::classes().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::enums().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::enums().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/summary.md

@@ -6,7 +6,7 @@
 * 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 PIChunkStream)
+* 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
@@ -57,7 +57,7 @@
 * общение с консолью (\a PICout)
 * контейнеры (\a PIVector, \a PIDeque, \a PIVector2D, \a PIStack, \a PIQueue, \a PIMap, \a PISet)
 * байтовый массив (\a PIByteArray)
-* сериализация (\a PIChunkStream)
+* сериализация (\a PIBinaryStream, \a PITextStream, \a PIIOBinaryStream, \a PIIOTextStream, \a PIChunkStream)
 * строка (\a PIConstChars, \a PIString, \a PIStringList)
 * базовый объект (события и обработчики) (\a PIObject)
 * многопоточность

doc/pages/using_basic.md

@@ -56,7 +56,7 @@ class MainClass: public PITimer {
 public:
 	MainClass() {}
 protected:
-	void tick(void * data, int delimiter) {
+	void tick(int delimiter) {
 		piCout << "timer tick";
 		// timer tick
 	}

esp-pip/main.cpp

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

libs/client_server/piclientserver_client.cpp

@@ -0,0 +1,54 @@
+/*
+    PIP - Platform Independent Primitives
+	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 "piclientserver_client.h"
+
+#include "piclientserver_server.h"
+#include "piethernet.h"
+
+
+void PIClientServer::ServerClient::createForServer(Server * parent, PIEthernet * tcp_) {
+	tcp = tcp_;
+	tcp->setParameter(PIEthernet::KeepConnection, false);
+	init();
+	CONNECTL(tcp, disconnected, ([this, parent](bool) { parent->clientDisconnected(this); }));
+}
+
+
+PIClientServer::Client::Client() {
+	tcp = new PIEthernet(PIEthernet::TCP_Client);
+	tcp->setParameter(PIEthernet::KeepConnection, true);
+	own_tcp = true;
+	init();
+}
+
+
+PIClientServer::Client::~Client() {
+	if (tcp) tcp->setDebug(false);
+	close();
+	stopAndWait();
+}
+
+
+void PIClientServer::Client::connect(PINetworkAddress addr) {
+	if (!tcp || !own_tcp) return;
+	close();
+	config.apply(this);
+	tcp->connect(addr, true);
+	tcp->startThreadedRead();
+}

libs/client_server/piclientserver_client_base.cpp

@@ -0,0 +1,117 @@
+/*
+    PIP - Platform Independent Primitives
+	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 "piclientserver_client_base.h"
+
+#include "piethernet.h"
+#include "piliterals_time.h"
+
+
+PIClientServer::ClientBase::ClientBase() {}
+
+
+PIClientServer::ClientBase::~ClientBase() {
+	close();
+	stopAndWait();
+	if (own_tcp) piDeleteSafety(tcp);
+	piDeleteSafety(diag);
+}
+
+
+void PIClientServer::ClientBase::close() {
+	if (!tcp) return;
+	can_write = false;
+	tcp->stop();
+	stream.clear();
+}
+
+
+void PIClientServer::ClientBase::stopAndWait() {
+	if (!tcp) return;
+	tcp->stopAndWait(10_s);
+	if (tcp->isThreadedRead()) tcp->terminateThreadedRead();
+	tcp->close();
+	stream.clear();
+}
+
+
+int PIClientServer::ClientBase::write(const void * d, const size_t s) {
+	if (!tcp) return -1;
+	if (!can_write) return 0;
+	PIMutexLocker guard(write_mutex);
+	// piCout << "... send ...";
+	stream.send(PIByteArray(d, s));
+	// piCout << "... send ok";
+	return s;
+}
+
+
+void PIClientServer::ClientBase::enableDiagnostics() {
+	if (diag) return;
+	diag = new PIDiagnostics();
+}
+
+
+PIDiagnostics::State PIClientServer::ClientBase::diagnostics() const {
+	if (!diag) return {};
+	return diag->state();
+}
+
+
+int PIClientServer::ClientBase::receivePacketProgress() const {
+	return stream.receivePacketProgress();
+}
+
+
+void PIClientServer::ClientBase::init() {
+	if (!tcp) return;
+	CONNECTL(&stream, sendRequest, [this](const PIByteArray & ba) {
+		if (!can_write) return;
+		tcp->send(ba);
+		if (diag) diag->sended(ba.size_s());
+		// piMSleep(1);
+	});
+	CONNECTL(&stream, packetReceiveEvent, [this](PIByteArray & ba) { readed(ba); });
+	CONNECTL(&stream, startPacketReceive, [this](int size) { receivePacketStart(size); });
+	CONNECTL(&stream, endPacketReceive, [this]() { receivePacketEnd(); });
+	CONNECTL(tcp, threadedReadEvent, [this](const uchar * readed, ssize_t size) {
+		if (!can_write) return;
+		stream.received(readed, size);
+		if (diag) diag->received(size);
+	});
+	CONNECTL(tcp, connected, [this]() {
+		can_write = true;
+		// piCout << "Connected";
+		connected();
+	});
+	CONNECTL(tcp, disconnected, [this](bool) {
+		can_write = false;
+		stream.clear();
+		// piCout << "Disconnected";
+		disconnected();
+	});
+}
+
+
+void PIClientServer::ClientBase::destroy() {
+	write_mutex.lock();
+	close();
+	piDeleteSafety(tcp);
+	write_mutex.unlock();
+	// piCout << "Destroyed";
+}

libs/client_server/piclientserver_config.cpp

@@ -0,0 +1,50 @@
+/*
+    PIP - Platform Independent Primitives
+	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 "piclientserver_config.h"
+
+#include "piclientserver_client_base.h"
+
+
+void PIClientServer::Config::setPacketSign(ushort sign) {
+	packet_sign = sign;
+}
+
+
+void PIClientServer::Config::setPacketSize(int bytes) {
+	packet_size = bytes;
+}
+
+
+void PIClientServer::Config::enableSymmetricEncryption(const PIByteArray & key) {
+	crypt_key = key;
+}
+
+
+void PIClientServer::Config::apply(ClientBase * client) {
+	auto & s(client->stream);
+
+	s.setPacketSign(packet_sign);
+	s.setMaxPacketSize(packet_size);
+
+	if (crypt_key.isNotEmpty()) {
+		s.setCryptEnabled(true);
+		s.setCryptKey(crypt_key);
+	} else
+		s.setCryptEnabled(false);
+}

libs/client_server/piclientserver_server.cpp

@@ -0,0 +1,143 @@
+/*
+    PIP - Platform Independent Primitives
+	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 "piclientserver_server.h"
+
+#include "piclientserver_client.h"
+#include "piethernet.h"
+#include "piliterals_time.h"
+
+
+PIClientServer::Server::Server() {
+	tcp_server     = new PIEthernet(PIEthernet::TCP_Server);
+	clean_thread   = new PIThread();
+	client_factory = [] { return new ServerClient(); };
+	CONNECTL(tcp_server, newConnection, [this](PIEthernet * c) {
+		PIMutexLocker guard(clients_mutex);
+		if (clients.size_s() >= max_clients) {
+			piCout << "Server::newConnection overflow clients count";
+			delete c;
+			return;
+		}
+		auto sc = client_factory();
+		if (!sc) {
+			piCout << "ClientFactory returns nullptr!";
+			return;
+		}
+		sc->createForServer(this, c);
+		newClient(sc);
+	});
+
+	clean_thread->start([this]() {
+		clean_notifier.wait();
+		PIVector<ServerClient *> to_delete;
+		clients_mutex.lock();
+		for (auto c: clients) {
+			const PIEthernet * eth = c->getTCP();
+			if (!eth) continue;
+			if (eth->isConnected()) continue;
+			c->can_write = false;
+			to_delete << c;
+		}
+		for (auto c: to_delete)
+			clients.removeOne(c);
+		clients_mutex.unlock();
+		for (auto c: to_delete) {
+			c->aboutDelete();
+			c->destroy();
+			delete c;
+		}
+	});
+}
+
+
+PIClientServer::Server::~Server() {
+	clean_thread->stop();
+	clean_notifier.notify();
+	clean_thread->waitForFinish();
+	piDeleteSafety(clean_thread);
+	stopServer();
+	for (auto c: clients) {
+		c->aboutDelete();
+		c->destroy();
+		delete c;
+	}
+	piDeleteSafety(tcp_server);
+}
+
+
+void PIClientServer::Server::listen(PINetworkAddress addr) {
+	if (!tcp_server) return;
+	stopServer();
+	is_closing = false;
+	tcp_server->listen(addr, true);
+	// piCout << "Listen on" << addr.toString();
+}
+
+
+void PIClientServer::Server::closeAll() {
+	clients_mutex.lock();
+	for (auto c: clients) {
+		c->aboutDelete();
+		c->destroy();
+		delete c;
+	}
+	clients.clear();
+	clients_mutex.unlock();
+}
+
+
+void PIClientServer::Server::setMaxClients(int new_max_clients) {
+	max_clients = new_max_clients;
+}
+
+
+int PIClientServer::Server::clientsCount() const {
+	PIMutexLocker guard(clients_mutex);
+	return clients.size_s();
+}
+
+
+void PIClientServer::Server::forEachClient(std::function<void(ServerClient *)> func) {
+	PIMutexLocker guard(clients_mutex);
+	for (auto * c: clients) {
+		func(c);
+		if (is_closing) break;
+	}
+}
+
+
+void PIClientServer::Server::stopServer() {
+	if (!tcp_server) return;
+	is_closing = true;
+	tcp_server->stopThreadedListen();
+	tcp_server->stopAndWait();
+}
+
+
+void PIClientServer::Server::newClient(ServerClient * c) {
+	clients << c;
+	config.apply(c);
+	c->tcp->startThreadedRead();
+	c->connected();
+}
+
+
+void PIClientServer::Server::clientDisconnected(ServerClient * c) {
+	clean_notifier.notify();
+}

libs/cloud/picloudclient.cpp

@@ -18,43 +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;
 	is_deleted   = false;
 	//	setReopenEnabled(false);
-	CONNECTL(&eth, connected, [this](){opened_ = true; tcp.sendStart();});
+	CONNECTL(&eth, connected, [this]() {
-	CONNECTU(&streampacker, packetReceiveEvent, this, _readed);
+		opened_ = true;
+		tcp.sendStart();
+	});
+	CONNECT1(void, PIByteArray, &streampacker, packetReceiveEvent, this, _readed);
 	CONNECTL(&eth, disconnected, [this](bool) {
 		if (is_deleted) return;
 		bool need_disconn = is_connected;
 		// piCoutObj << "eth disconnected";
-		static_cast<PIThread*>(&eth)->stop();
+		eth.stop();
 		opened_ = false;
 		internalDisconnect();
-		if (need_disconn)
+		if (need_disconn) disconnected();
-			disconnected();
 		// piCoutObj << "eth disconnected done";
 	});
 }
 
 
 PICloudClient::~PICloudClient() {
-	//piCoutObj << "~PICloudClient()";
+	// piCoutObj << "~PICloudClient() ..." << this;
-	PIThread::stop();
-	//eth.close();
-	//if (is_connected) disconnected();
-	close();
-	//piCoutObj << "~PICloudClient() closed";
-	internalDisconnect();
-//	stop(false);
 	is_deleted = true;
+	stopAndWait();
+	close();
 	internalDisconnect();
-	//piCoutObj << "~PICloudClient() done";
+	// piCoutObj << "~PICloudClient() done" << this;
 }
 
 
@@ -69,19 +68,26 @@ void PICloudClient::setKeepConnection(bool on) {
 }
 
 
+void PICloudClient::interrupt() {
+	cond_buff.notifyOne();
+	cond_connect.notifyOne();
+	eth.interrupt();
+}
+
+
 bool PICloudClient::openDevice() {
 	// piCoutObj << "open";// << path();
-	bool op = eth.connect(PIEthernet::Address::resolve(path()), false);
+	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());
+		bool conn_ok = cond_connect.waitFor(mutex_connect, eth.readTimeout());
 		// piCoutObj << "conn_ok" << conn_ok << is_connected;
 		mutex_connect.unlock();
 		if (!conn_ok) {
 			mutex_connect.lock();
-			eth.stop();
+			eth.stopAndWait();
 			eth.close();
 			mutex_connect.unlock();
 		}
@@ -98,24 +104,28 @@ bool PICloudClient::closeDevice() {
 	if (is_connected) {
 		internalDisconnect();
 	}
-	eth.stop();
+	eth.stopAndWait();
 	eth.close();
 	return true;
 }
 
 
-int PICloudClient::readDevice(void * read_to, int max_size) {
+ssize_t PICloudClient::readDevice(void * read_to, ssize_t max_size) {
-	if (is_deleted) return -1;
+	if (is_deleted || max_size <= 0) return -1;
-	//piCoutObj << "readDevice";
+	// piCoutObj << "readDevice ...";
 	if (!is_connected && eth.isClosed()) openDevice();
-	int sz = -1;
+	ssize_t sz = -1;
 	mutex_buff.lock();
-	cond_buff.wait(mutex_buff, [this](){return !buff.isEmpty() || !is_connected;});
 	if (is_connected) {
-		sz = piMini(max_size, buff.size());
+		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;
@@ -123,14 +133,15 @@ int PICloudClient::readDevice(void * read_to, int max_size) {
 }
 
 
-int PICloudClient::writeDevice(const void * data, int size) {
+ssize_t PICloudClient::writeDevice(const void * data, ssize_t size) {
-	if (is_deleted) return -1;
+	if (is_deleted || !is_connected) return -1;
-//	piCoutObj << "writeDevice";
+	// piCoutObj << "writeDevice" << size;
 	return tcp.sendData(PIByteArray(data, size));
 }
 
 
 void PICloudClient::internalDisconnect() {
+	// piCoutObj << "internalDisconnect";
 	is_connected = false;
 	cond_buff.notifyOne();
 	cond_connect.notifyOne();
@@ -155,24 +166,26 @@ void PICloudClient::_readed(PIByteArray & ba) {
 			}
 			break;
 		case PICloud::TCP::Disconnect:
-			static_cast<PIThread*>(&eth)->stop();
+			eth.stop();
 			opened_ = false;
 			eth.close();
 			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:
+		default: break;
-		break;
 		}
 		// piCoutObj << "readed" << ba.toHex();
 	}
-	while (buff.size_s() > threadedReadBufferSize()) piMSleep(100); // FIXME: sleep here is bad
 	// piCoutObj << "_readed done";
 }
-

libs/cloud/picloudserver.cpp

@@ -19,30 +19,62 @@
 
 #include "picloudserver.h"
 
+#include "piliterals_time.h"
+
 
 PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode): PIIODevice(path, mode), PICloudBase() {
 	PIString server_name = "PCS_" + PIString::fromNumber(randomi() % 1000);
 	tcp.setRole(PICloud::TCP::Server);
 	tcp.setServerName(server_name);
 	setName("cloud_server__" + server_name);
-	CONNECTU(&streampacker, packetReceiveEvent, this, _readed);
+	is_deleted = false;
-	CONNECTL(&eth, connected, [this](){opened_ = true; piCoutObj << "connected"; tcp.sendStart();});
+	eth.setReopenEnabled(false);
-	CONNECTL(&eth, disconnected, [this](bool){
+	setThreadedReadBufferSize(eth.threadedReadBufferSize());
-		piCoutObj << "disconnected";
+	CONNECT1(void, PIByteArray, &streampacker, packetReceiveEvent, this, _readed);
-		static_cast<PIThread*>(&eth)->stop();
+	CONNECTL(&eth, connected, [this]() {
-		opened_ = false;
+		open_mutex.lock();
-		ping_timer.stop(false);
+		opened_ = true;
-		piMSleep(100);
+		cvar.notifyOne();
+		open_mutex.unlock();
+		piCoutObj << "connected";
+		tcp.sendStart();
 	});
-	CONNECTL(&ping_timer, tickEvent, [this] (void *, int){
+	CONNECTL(&eth, disconnected, [this](bool) {
+		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;
+		cvar.notifyOne();
+		open_mutex.unlock();
+		ping_timer.stop();
+	});
+	ping_timer.setSlot([this]() {
 		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;
 }
 
 
@@ -59,55 +91,71 @@ PIVector<PICloudServer::Client *> PICloudServer::clients() const {
 
 
 bool PICloudServer::openDevice() {
-	//piCout << "PICloudServer open device" << path();
+	piCoutObj << "open device" << path();
-	bool op = eth.connect(PIEthernet::Address::resolve(path()), false);
+	if (is_deleted) return false;
+	bool op = eth.connect(PINetworkAddress::resolve(path()), false);
 	if (op) {
 		eth.startThreadedRead();
-		ping_timer.start(5000);
+		ping_timer.start(5_s);
 		return true;
-	}
+	} else {
-	ping_timer.stop(false);
+		ping_timer.stop();
 		eth.close();
 		return false;
 	}
+}
 
 
 bool PICloudServer::closeDevice() {
-	eth.stop();
+	// piCoutObj << "closeDevice" << this;
-	ping_timer.stop(false);
+	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";
-	if (!opened_) openDevice();
+	open_mutex.lock();
-	else piMSleep(eth.readTimeout());
+	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);
 }
 
@@ -115,17 +163,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) {
+	// piCoutObj << "~PICloudServer::Client..." << this;
-		is_connected = false;
-		cond_buff.notifyOne();
-	}
 	close();
-	stop();
+	stopAndWait(10_s);
+	// piCoutObj << "~PICloudServer::Client done" << this;
 }
 
 
@@ -135,7 +182,7 @@ bool PICloudServer::Client::openDevice() {
 
 
 bool PICloudServer::Client::closeDevice() {
-	PIThread::stop(false);
+	// piCoutObj << "closeDevice" << this;
 	if (is_connected) {
 		server->clientDisconnect(client_id);
 		is_connected = false;
@@ -145,37 +192,52 @@ bool PICloudServer::Client::closeDevice() {
 }
 
 
-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;
-	int sz = -1;
+	ssize_t sz = -1;
 	mutex_buff.lock();
-	cond_buff.wait(mutex_buff, [this](){return !buff.isEmpty() || !is_connected;});
 	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); // FIXME: sleep here is bad
 }
 
 
 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) {
@@ -185,11 +247,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);
@@ -199,13 +262,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: {
@@ -213,7 +280,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;
@@ -224,15 +291,10 @@ 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);
-	auto it = index_clients.makeIterator();
+	removed_clients_.removeAll(c);
-	while (it.hasNext()) {
+	index_clients.removeWhere([c](uint, Client * v) { return v == c; });
-		it.next();
-		if (it.value() == c) {
-			index_clients.remove(it.key());
-			break;
-		}
-	}
 	clients_mutex.unlock();
 }

libs/cloud/picloudtcp.cpp

@@ -18,8 +18,9 @@
 */
 
 #include "picloudtcp.h"
-#include "picrypt.h"
+
 #include "pichunkstream.h"
+#include "picrypt.h"
 #include "piethernet.h"
 #include "pistreampacker.h"
 
@@ -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(PIByteArray(server_name_.data(), server_name_.size()), (const unsigned char *)hash_cloud_key, sizeof(hash_cloud_key));
+	suuid =
+		PICrypt::hash(PIByteArray(server_name_.data(), server_name_.size()), (const unsigned char *)hash_cloud_key, sizeof(hash_cloud_key));
 }
 
 
@@ -132,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;
@@ -168,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

@@ -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,14 +17,16 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "piscreen.h"
+
 #include "piincludes_p.h"
+#include "piliterals_time.h"
 #ifndef WINDOWS
-#  include <sys/ioctl.h>
 #  include <fcntl.h>
+#  include <sys/ioctl.h>
 #  include <termios.h>
 #else
-#  include <wingdi.h>
 #  include <wincon.h>
+#  include <wingdi.h>
 #  ifndef COMMON_LVB_UNDERSCORE
 #	define COMMON_LVB_UNDERSCORE 0x8000
 #  endif
@@ -51,6 +53,18 @@ PRIVATE_DEFINITION_END(PIScreen::SystemConsole)
 PIScreen::SystemConsole::SystemConsole() {
 	width = height = pwidth = pheight = 0;
 	mouse_x = mouse_y = -1;
+}
+
+
+PIScreen::SystemConsole::~SystemConsole() {
+#ifdef WINDOWS
+	SetConsoleMode(PRIVATE->hOut, PRIVATE->smode);
+	SetConsoleTextAttribute(PRIVATE->hOut, PRIVATE->dattr);
+#endif
+}
+
+
+void PIScreen::SystemConsole::begin() {
 	int w, h;
 #ifdef WINDOWS
 	PRIVATE->ulcoord.X = 0;
@@ -74,18 +88,6 @@ PIScreen::SystemConsole::SystemConsole() {
 #  endif
 #endif
 	resize(w, h);
-}
-
-
-PIScreen::SystemConsole::~SystemConsole() {
-#ifdef WINDOWS
-	SetConsoleMode(PRIVATE->hOut, PRIVATE->smode);
-	SetConsoleTextAttribute(PRIVATE->hOut, PRIVATE->dattr);
-#endif
-}
-
-
-void PIScreen::SystemConsole::begin() {
 #ifdef WINDOWS
 	SetConsoleMode(PRIVATE->hOut, ENABLE_WRAP_AT_EOL_OUTPUT);
 	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
@@ -93,6 +95,7 @@ void PIScreen::SystemConsole::begin() {
 	PRIVATE->bc.Y = 0;
 #endif
 	clear();
+	clearScreen();
 	hideCursor();
 }
 
@@ -243,10 +246,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;
+	if (c.format.flags & Bold)
-	else attr &= ~FOREGROUND_INTENSITY;
+		attr |= FOREGROUND_INTENSITY;
-	if (c.format.flags & Underline) attr |= COMMON_LVB_UNDERSCORE;
+	else
-	else attr &= ~COMMON_LVB_UNDERSCORE;
+		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;
@@ -291,7 +298,8 @@ 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
@@ -357,8 +365,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);
+	FillConsoleOutputAttribute(PRIVATE->hOut,
-	FillConsoleOutputCharacter(PRIVATE->hOut, ' ', width * height - width * PRIVATE->ccoord.Y + PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
+	                           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
@@ -383,7 +399,7 @@ void PIScreen::SystemConsole::showCursor() {
 }
 
 
-
+// PIScreen
 
 PIScreen::PIScreen(bool startNow, PIKbdListener::KBFunc slot): PIThread(), drawer_(console.cells), root("rootTile") {
 	setName("screen");
@@ -391,20 +407,19 @@ 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);
+	CONNECT1(void, PIKbdListener::MouseEvent, listener, mouseEvent, this, mouse_event);
-	CONNECTU(listener, wheelEvent, this, wheel_event);
+	CONNECT1(void, PIKbdListener::WheelEvent, listener, wheelEvent, this, wheel_event);
 	if (startNow) start();
 }
 
 
 PIScreen::~PIScreen() {
-	if (isRunning())
+	if (isRunning()) stop();
-		stop();
+	PIThread::waitForFinish(100_ms);
-	PIThread::waitForFinish(10);
+	listener->waitForFinish(100_ms);
-	listener->waitForFinish(10);
 	delete listener;
 }
 
@@ -422,14 +437,12 @@ void PIScreen::key_event(PIKbdListener::KeyEvent key) {
 	return;
 	*/
 	PIScreenTile * rtile = rootTile();
-	if (tile_dialog)
+	if (tile_dialog) rtile = 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))
+			if (tile_focus->keyEvent(key)) return;
-				return;
 		}
 	}
 	if (ret_func != 0) ret_func(key, data_);
@@ -455,7 +468,6 @@ PIVector<PIScreenTile * > PIScreen::prepareMouse(PIKbdListener::MouseEvent * e)
 				ff = true;
 			}
 		}
-
 	}
 	return tl;
 }
@@ -488,15 +500,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])
+		if (t->focus_flags[CanHasFocus]) ftl << t;
-			ftl << t;
 	}
 	int ind = -1;
 	for (int i = 0; i < ftl.size_s(); ++i)
@@ -504,18 +514,15 @@ bool PIScreen::nextFocus(PIScreenTile * rt, PIKbdListener::KeyEvent key) {
 			ind = i;
 			break;
 		}
-	if (ind < 0)
+	if (ind < 0) tile_focus = 0;
-		tile_focus = 0;
 	if (ftl.isEmpty())
 		tile_focus = 0;
 	else {
 		if (tile_focus)
-			if (!tile_focus->visible)
+			if (!tile_focus->visible) tile_focus = 0;
-				tile_focus = 0;
 		int next = tile_focus ? 0 : 1;
 		if (tile_focus) {
-			if (tile_focus->focus_flags[NextByTab] && key.key == PIKbdListener::Tab)
+			if (tile_focus->focus_flags[NextByTab] && key.key == PIKbdListener::Tab) next = 1;
-				next = 1;
 			if (tile_focus->focus_flags[NextByArrowsHorizontal]) {
 				if (key.key == PIKbdListener::LeftArrow) next = -1;
 				if (key.key == PIKbdListener::RightArrow) next = 1;
@@ -550,22 +557,19 @@ void PIScreen::tileEventInternal(PIScreenTile * t, TileEvent e) {
 
 
 void PIScreen::tileRemovedInternal(PIScreenTile * t) {
-	if (tile_dialog == t)
+	if (tile_dialog == t) tile_dialog = 0;
-		tile_dialog = 0;
 }
 
 
 void PIScreen::tileSetFocusInternal(PIScreenTile * t) {
 	PIScreenTile * rt = rootTile();
-	if (tile_dialog)
+	if (tile_dialog) rt = 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])
+	if (tile_focus->focus_flags[CanHasFocus]) tile_focus->has_focus = true;
-		tile_focus->has_focus = true;
 }
 
 
@@ -587,8 +591,14 @@ void PIScreen::waitForFinish() {
 }
 
 
+void PIScreen::start(bool wait) {
+	PIThread::start(25_Hz);
+	if (wait) waitForFinish();
+}
+
+
 void PIScreen::stop(bool clear) {
-	PIThread::stop(true);
+	PIThread::stopAndWait();
 	if (clear) console.clearScreen();
 #ifndef WINDOWS
 	fflush(0);
@@ -620,8 +630,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,
+		drawer_.drawFrame(dx,
-						  (Color)tile_dialog->back_format.color_back, (CharFlags)tile_dialog->back_format.flags);
+		                  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();
@@ -637,8 +652,6 @@ void PIScreen::end() {
 PIScreenTile * PIScreen::tileByName(const PIString & name) {
 	PIVector<PIScreenTile *> tl(tiles());
 	piForeach(PIScreenTile * t, tl)
-		if (t->name() == name)
+		if (t->name() == name) return t;
-			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);
+			x = i;
-			if (x >= 0 && x < width && y >= 0 && y < height)
+			y = piRound(cy);
-				cells[y][x] = cc;
+			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)
+		if (x1 >= 0 && x1 < width && y >= 0 && y < height) cells[y][x1] = cc;
-			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;
+			x = piRound(cx);
-			if (x >= 0 && x < width && y >= 0 && y < height)
+			y = i;
-				cells[y][x] = cc;
+			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)
+		if (x >= 0 && x < width && y1 >= 0 && y1 < height) cells[y1][x] = cc;
-			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)
+				if (i >= 0 && i < width) cv[i] = cc;
-					cv[i] = cc;
 		}
 		j = xs[k];
 		if (j >= 0 && j < width) {
 			for (int i = y0; i != y1; i += dy)
-				if (i >= 0 && i < height)
+				if (i >= 0 && i < height) cells[i][j] = cc;
-					cells[i][j] = cc;
 		}
 	}
 	int i = x1, j = y1;
-	if (i >= 0 && i < width && j >= 0 && j < height)
+	if (i >= 0 && i < width && j >= 0 && j < height) cells[j][i] = cc;
-		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)
+				if (i >= 0 && i < width) cv[i] = cc;
-					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)
+				if (i >= 0 && i < height) cells[i][j] = cc;
-					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)
+				if (i >= 0 && i < width) cv[i] = cc;
-					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)
+					if ((i + x0) >= 0 && (i + x0) < width) cv[x0 + i] = contv[i];
-						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)
+	if (screen) screen->tileRemovedInternal(this);
-		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)
+		if (t->visible || !only_visible) ret << t << t->children(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_ &&
+		if (x >= t->x_ && (x - t->x_) < t->width_ && y >= t->y_ && (y - t->y_) < t->height_) {
-			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;
+	if (direction == Horizontal)
-	else h += sl;
+		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())
+								if (tiles[j]->size_policy == pol && tiles[j]->visible && tiles[j]->needLayout()) asizes[j] += pas;
-									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_)
+		if (t->pw != t->width_ || t->ph != t->height_) t->resizeEvent(t->width_, 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:
+	case PIKbdListener::PageUp: cur -= lhei / 2; oo -= lhei / 2;
-		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);
+			if (selected[cur])
-			else 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:
+	case PIKbdListener::Home: cur = offset = 0; return true;
-		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())
+		if (cur >= 0 && cur < content.size_s()) raiseEvent(TileEvent(RowPressed, cur));
-			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:
+	case PIKbdListener::MouseButtonPress: mouse_sel = !selected.contains(cur); break;
-		mouse_sel = !selected.contains(cur);
+	case PIKbdListener::MouseButtonDblClick: keyEvent(PIKbdListener::KeyEvent(PIKbdListener::Return)); return true;
-		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;
+			if (mouse_sel)
-			else selected.remove(cur);
+				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)
+	if (direction == PIScreenTypes::Horizontal) cx += dx;
-		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:
+	case PIKbdListener::Return: raiseEvent(TileEvent(ButtonSelected, cur)); return true;
-		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 &&
+			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) {
-				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)
+		if (content.size_s() > max_lines) content.remove(0, 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)
+	if (offset > 0) d->drawText(x_, y_, "<", Green, Black, Bold);
-		d->drawText(x_, y_, "<", Green, Black, Bold);
+	if (text.size_s() - offset >= width_ - 2) d->drawText(x_ + width_ - 1, 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())
+		if (cur > text.size_s() || text.isEmpty()) return true;
-			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())
+		if (cur >= text.size_s() || text.isEmpty()) return true;
-			return true;
 		text.remove(cur, 1);
 		if (cur < 0) cur = 0;
 		if (cur > text.size_s()) cur = text.size_s();
@@ -686,8 +673,7 @@ bool TileInput::keyEvent(PIKbdListener::KeyEvent key) {
 	case PIKbdListener::F9:
 	case PIKbdListener::F10:
 	case PIKbdListener::F11:
-	case PIKbdListener::F12:
+	case PIKbdListener::F12: break;
-		break;
 	default:
 		text.insert(cur, PIChar((ushort)key.key));
 		cur++;

libs/console/piterminal.cpp

@@ -16,17 +16,20 @@
     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 "piliterals_time.h"
 #include "pisharedmemory.h"
 #ifndef MICRO_PIP
 #  ifdef WINDOWS
+#	include <wincon.h>
 #	include <windows.h>
 #	include <wingdi.h>
-#  include <wincon.h>
 #	include <winuser.h>
 #  else
 #	include "piprocess.h"
+
 #	include <csignal>
 #	include <fcntl.h>
 #	include <sys/ioctl.h>
@@ -123,9 +126,8 @@ PITerminal::PITerminal(): PIThread() {
 
 
 PITerminal::~PITerminal() {
-	if (isRunning())
+	if (isRunning()) stop();
-		stop();
+	PIThread::waitForFinish(1_s);
-	PIThread::waitForFinish(10);
 	destroy();
 #  ifdef WINDOWS
 	if (PRIVATE->shm) delete PRIVATE->shm;
@@ -165,7 +167,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;
@@ -185,7 +188,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;
@@ -235,7 +239,8 @@ 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
@@ -253,8 +258,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)
+			if (cursor_y >= 0 && cursor_y < size_y) ret[cursor_y][cursor_x].format.flags ^= PIScreenTypes::Inverse;
-				ret[cursor_y][cursor_x].format.flags ^= PIScreenTypes::Inverse;
 	return ret;
 }
 
@@ -395,16 +399,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)
+			if (PRIVATE->read_buf[0] < 0x80) parse = true;
-				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;
@@ -445,7 +448,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);
@@ -498,7 +502,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;
 			}
@@ -524,8 +529,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 >= 30 && av <= 37) {
-					if (av >= 40 && av <= 47) {col = true; target = true;}
+						col    = true;
+						target = false;
+					}
+					if (av >= 40 && av <= 47) {
+						col    = true;
+						target = true;
+					}
 					if (col) {
 						int cfl = 0;
 						switch (cid) {
@@ -586,25 +597,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;
 		}
@@ -616,65 +631,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;
+			int v = es.toInt();
-			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];
+			if (v == 0) v = 1;
-			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 = piClamp(size_y - 1, PRIVATE->win_y0, PRIVATE->win_y1);
-				for (int i = 0; i < PRIVATE->cur_x; ++i) cells[j][i] = def_cell;
+			     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;
+			int v = es.toInt();
-			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];
+			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;
+			int v = es.toInt();
-			for (int i = PRIVATE->cur_x; i < size_x - v; ++i) cells[PRIVATE->cur_y][i] = cells[PRIVATE->cur_y][i + v];
+			if (v == 0) v = 1;
-			for (int i = size_x - v; i < size_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
+			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;
+			int v = es.toInt();
-			for (int i = size_x - 1; i >= PRIVATE->cur_x + v; --i) cells[PRIVATE->cur_y][i] = cells[PRIVATE->cur_y][i - v];
+			if (v == 0) v = 1;
-			for (int i = PRIVATE->cur_x; i < PRIVATE->cur_x + v; ++i) cells[PRIVATE->cur_y][i] = def_cell;
+			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_x; i < size_x; ++i)
-				for (int i = PRIVATE->cur_y + 1; i < size_y; ++i) cells[i].fill(def_cell);
+					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_x; ++i)
-				for (int i = 0; i < PRIVATE->cur_y; ++i) cells[i].fill(def_cell);
+					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;
 			}
@@ -684,14 +725,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;
+				for (int i = 0; i <= PRIVATE->cur_x; ++i)
-				break;
+					cells[PRIVATE->cur_y][i] = def_cell;
-			case 2:
-				cells[PRIVATE->cur_y].fill(def_cell);
 				break;
+			case 2: cells[PRIVATE->cur_y].fill(def_cell); break;
 			}
 		}
 	}
@@ -721,8 +762,10 @@ void PITerminal::moveCursor(int dx, int dy) {
 
 
 int PITerminal::termType(const PIString & t) {
-	if (t == "xterm") return PIKbdListener::vt_xterm;
+	if (t == "xterm")
-	else if (t == "linux") return PIKbdListener::vt_linux;
+		return PIKbdListener::vt_xterm;
+	else if (t == "linux")
+		return PIKbdListener::vt_linux;
 	return PIKbdListener::vt_none;
 }
 #  endif
@@ -767,12 +810,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();
@@ -797,7 +856,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;
@@ -856,7 +916,7 @@ bool PITerminal::initialize() {
 #  endif
 	cursor_blink = false;
 	cursor_tm.reset();
-	start(40);
+	start(25_Hz);
 	return true;
 }
 
@@ -864,7 +924,7 @@ bool PITerminal::initialize() {
 void PITerminal::destroy() {
 	// piCout << "destroy ...";
 	stop();
-	waitForFinish(1000);
+	waitForFinish(1_s);
 #  ifdef WINDOWS
 	if (PRIVATE->pi.hProcess) {
 		// piCout << "term";
@@ -877,10 +937,8 @@ void PITerminal::destroy() {
 		// piCout << "destroy" << size_y;
 #  else
 #	ifdef HAS_FORKPTY
-	if (PRIVATE->pid != 0)
+	if (PRIVATE->pid != 0) kill(PRIVATE->pid, SIGKILL);
-		kill(PRIVATE->pid, SIGKILL);
+	if (PRIVATE->fd != 0) ::close(PRIVATE->fd);
-	if (PRIVATE->fd != 0)
-		::close(PRIVATE->fd);
 #	endif
 #  endif
 	initPrivate();

libs/crypt/piauth.cpp

@@ -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)
+	if (key.size() != crypto_secretbox_KEYBYTES) key.resize(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)
+	if (key.size() != crypto_secretbox_KEYBYTES) key.resize(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
@@ -195,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());
@@ -345,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)
+	if (public_key.size() != crypto_box_PUBLICKEYBYTES) return ret;
-		return ret;
+	if (secret_key.size() != crypto_box_SECRETKEYBYTES) 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)
+	if (crypto_box_easy(ret.data(), data.data(), data.size(), n.data(), public_key.data(), secret_key.data()) != 0) return PIByteArray();
-		return PIByteArray();
 	ret.append(n);
 #else
 	PICRYPT_DISABLED_WARNING
@@ -383,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
@@ -405,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);
+	int r = crypto_pwhash(ph.data(),
-	//crypto_pwhash_str(out, (const char*)pass.data(), pass.size(), crypto_pwhash_argon2i_opslimit_moderate(), crypto_pwhash_argon2i_memlimit_moderate());
+	                      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;
@@ -434,8 +447,7 @@ bool PICrypt::init() {
 	if (inited) return true;
 	// piCout << "[PICrypt]" << "init ...";
 	inited = sodium_init();
-	if (!inited)
+	if (!inited) inited = sodium_init();
-		inited = sodium_init();
 	// piCout << "[PICrypt]" << "init" << inited;
 	return inited;
 #else
@@ -443,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##_() {                                                        \
-	_PIFFTW_P_##type##_::~_PIFFTW_P_##type##_() {delete (PIFFTW_Private<type>*)impl;} \
+		impl = new PIFFTW_Private<type>();                                                              \
-	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);} \
+	_PIFFTW_P_##type##_::~_PIFFTW_P_##type##_() {                                                       \
-	void _PIFFTW_P_##type##_::preparePlan(int size, int op) {return ((PIFFTW_Private<type>*)impl)->preparePlan(size, op);}
+		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

@@ -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:
+		default: size = 0; break;
-				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() {
-		PlanParams(int size_, FFT_Operation op_) {size = size_; op = op_;}
+			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) {
+template<>
-	plan = fftwf_plan_dft_1d(size, (fftwf_complex *)in, (fftwf_complex *)out, dir, flags);}
+inline void PIFFTW_Private<float>::p_createPlan_c2c_1d(void *& plan, int size, const void * in, void * out, int dir, int 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_1d(size, (fftwf_complex *)in, (fftwf_complex *)out, dir, 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<>
-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);}
+inline void PIFFTW_Private<float>::p_createPlan_r2c_1d(void *& plan, int size, const void * in, void * out, int flags) {
-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);}
+	plan = fftwf_plan_dft_r2c_1d(size, (float *)in, (fftwf_complex *)out, flags);
-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_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) {
+template<>
-	plan = fftw_plan_dft_1d(size, (fftw_complex *)in, (fftw_complex *)out, dir, flags);}
+inline void PIFFTW_Private<double>::p_createPlan_c2c_1d(void *& plan, int size, const void * in, void * out, int dir, int 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_1d(size, (fftw_complex *)in, (fftw_complex *)out, dir, 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<>
-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);}
+inline void PIFFTW_Private<double>::p_createPlan_r2c_1d(void *& plan, int size, const void * in, void * out, int flags) {
-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);}
+	plan = fftw_plan_dft_r2c_1d(size, (double *)in, (fftw_complex *)out, flags);
-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_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) {
+template<>
-	plan = fftwl_plan_dft_1d(size, (fftwl_complex *)in, (fftwl_complex *)out, dir, flags);}
+inline void PIFFTW_Private<ldouble>::p_createPlan_c2c_1d(void *& plan, int size, const void * in, void * out, int dir, int 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_1d(size, (fftwl_complex *)in, (fftwl_complex *)out, dir, 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<>
-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);}
+inline void PIFFTW_Private<ldouble>::p_createPlan_r2c_1d(void *& plan, int size, const void * in, void * out, int flags) {
-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);}
+	plan = fftwl_plan_dft_r2c_1d(size, (ldouble *)in, (fftwl_complex *)out, flags);
-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_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

@@ -19,6 +19,8 @@
 
 #include "pibroadcast.h"
 
+#include "piliterals_time.h"
+
 /** \class PIBroadcast
  * \brief Broadcast for all interfaces, including loopback
  *
@@ -57,8 +59,8 @@ PIBroadcast::PIBroadcast(bool send_only): PIThread(), PIEthUtilBase() {
 
 
 PIBroadcast::~PIBroadcast() {
-	PIThread::stop();
+	PIThread::stopAndWait();
-	mcast_mutex.unlock();
+	// mcast_mutex.unlock();
 	destroyAll();
 }
 
@@ -84,7 +86,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;
@@ -113,29 +115,28 @@ void PIBroadcast::setLoopbackPortsCount(int count) {
 
 
 void PIBroadcast::destroyAll() {
-	piForeach (PIEthernet * e, eth_mcast) {
+	for (auto * e: eth_mcast) {
-		e->stopThreadedRead();
+		e->stopAndWait();
-		delete e;
+		piDeleteSafety(e);
 	}
 	eth_mcast.clear();
 	if (eth_lo) {
-		eth_lo->stopThreadedRead();
+		eth_lo->stopAndWait();
-		delete eth_lo;
+		piDeleteSafety(eth_lo);
-		eth_lo = 0;
 	}
 }
 
 
-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) {
+	for (const auto & a: al) {
 		PIEthernet * ce = 0;
 		// piCout << "mcast try" << a;
 		if (_channels[Multicast]) {
@@ -151,7 +152,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;
 				}
@@ -166,14 +167,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;
 				}
@@ -189,7 +190,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()) {
@@ -203,14 +204,15 @@ void PIBroadcast::initAll(PIVector<PIEthernet::Address> al) {
 
 
 void PIBroadcast::send(const PIByteArray & data) {
-	if (!isRunning()) {
+	/*if (!isRunning()) {
 		reinit();
 		PIThread::start(3000);
-	}
+	}*/
 	PIByteArray cd = cryptData(data);
 	if (cd.isEmpty()) return;
 	PIMutexLocker ml(mcast_mutex);
-	piForeach (PIEthernet * e, eth_mcast) e->send(cd);
+	for (auto * e: eth_mcast)
+		e->send(cd);
 	if (eth_lo) {
 		for (int i = 0; i < lo_pcnt; ++i) {
 			eth_lo->send("127.0.0.1", lo_port + i, cd);
@@ -223,21 +225,23 @@ void PIBroadcast::startRead() {
 	if (!isRunning()) {
 		_started = false;
 		reinit();
-		PIThread::start(3000);
+		PIThread::start(3_s);
 	}
 	if (_send_only) return;
 	PIMutexLocker ml(mcast_mutex);
-	piForeach (PIEthernet * e, eth_mcast) e->startThreadedRead();
+	for (auto * e: eth_mcast)
+		e->startThreadedRead();
 	if (eth_lo) eth_lo->startThreadedRead();
 	_started = true;
 }
 
 
 void PIBroadcast::stopRead() {
-	if (isRunning()) stop();
+	if (isRunning()) stopAndWait();
 	PIMutexLocker ml(mcast_mutex);
-	piForeach (PIEthernet * e, eth_mcast) e->stopThreadedRead();
+	for (auto * e: eth_mcast)
-	if (eth_lo) eth_lo->stopThreadedRead();
+		e->stopAndWait();
+	if (eth_lo) eth_lo->stopAndWait();
 	_started = false;
 }
 
@@ -248,7 +252,7 @@ void PIBroadcast::reinit() {
 }
 
 
-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,7 +261,7 @@ 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();

libs/io_utils/piethutilbase.cpp

@@ -51,8 +51,7 @@ PIEthUtilBase::PIEthUtilBase() {
 }
 
 
-PIEthUtilBase::~PIEthUtilBase() {
+PIEthUtilBase::~PIEthUtilBase() {}
-}
 
 
 void PIEthUtilBase::setCryptEnabled(bool on) {

libs/io_utils/pipackedtcp.cpp

@@ -0,0 +1,199 @@
+/*
+    PIP - Platform Independent Primitives
+	PIPackedTCP
+    Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@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 "pipackedtcp.h"
+
+#include "piethernet.h"
+#include "piliterals.h"
+
+
+/** \class PIPackedTCP pipackedtcp.h
+ * \brief
+ * TCP packed channel
+ *
+ * \details
+ * \section PITCP_sec0 Synopsis
+ * %PIEthernet designed to work with IPv4 network via two protocols:
+ * UDP and TCP. This class allow you send and receive packets to/from
+ * another computer through network. Also it supports broadcast and
+ * multicast extensions.
+ *
+ * */
+
+
+PIPackedTCP::PIPackedTCP(Role role, const PINetworkAddress & addr): m_role(role) {
+	setMode(PIIODevice::ReadWrite);
+	packer.setCryptEnabled(false);
+	CONNECTL(&packer, packetReceiveEvent, [this](PIByteArray & data) {
+		PIMutexLocker ml(rec_mutex);
+		rec_queue.enqueue(data);
+	});
+	init();
+	setAddress(addr);
+}
+
+
+PIPackedTCP::~PIPackedTCP() {
+	stopAndWait();
+	if (client) client->stopAndWait();
+	if (eth) eth->stopAndWait();
+	piDeleteSafety(eth);
+}
+
+
+void PIPackedTCP::setAddress(const PINetworkAddress & addr) {
+	m_addr = addr;
+	setPath(m_addr.toString());
+}
+
+
+bool PIPackedTCP::isConnected() const {
+	if (m_role == Client) {
+		return eth->isConnected();
+	} else {
+		if (client) return client->isConnected();
+	}
+	return false;
+}
+
+
+bool PIPackedTCP::isConnecting() const {
+	if (m_role == Client) {
+		return eth->isConnecting();
+	} else {
+		if (client) return client->isConnecting();
+	}
+	return false;
+}
+
+
+void PIPackedTCP::init() {
+	if (client) client->stopAndWait();
+	if (eth) eth->stopAndWait();
+	piDeleteSafety(eth);
+	eth = new PIEthernet(m_role == Client ? PIEthernet::TCP_Client : PIEthernet::TCP_Server);
+	if (m_role == Client) {
+		eth->setReopenTimeout(100_ms);
+		packer.assignDevice(eth);
+		CONNECTL(eth, connected, [this]() {
+			packer.clear();
+			connected();
+		});
+		CONNECTL(eth, disconnected, [this](bool) {
+			packer.clear();
+			eth->connect(path(), true);
+			disconnected();
+		});
+	} else {
+		CONNECTL(eth, newConnection, [this](PIEthernet * c) {
+			if (client) client->stopAndWait();
+			piDeleteSafety(client);
+			client = c;
+			// piCout << "Server connected" << client;
+			packer.assignDevice(client);
+			CONNECTL(client, disconnected, [this](bool) {
+				packer.assignDevice(nullptr);
+				packer.clear();
+				disconnected();
+			});
+			client->startThreadedRead();
+			connected();
+		});
+	}
+}
+
+
+PIIODevice::DeviceInfoFlags PIPackedTCP::deviceInfoFlags() const {
+	return PIIODevice::Reliable;
+}
+
+
+PIString PIPackedTCP::constructFullPathDevice() const {
+	return PIString(m_role == Client ? "client" : "server") + ":" + path();
+}
+
+
+void PIPackedTCP::configureFromFullPathDevice(const PIString & full_path) {
+	PIStringList pl = full_path.split(":");
+	if (pl.size() >= 1) {
+		PIString p = pl[0].toLowerCase().left(1);
+		if (p == "c") m_role = Client;
+		if (p == "s") m_role = Server;
+		init();
+	}
+	PINetworkAddress addr("0.0.0.0", 13362);
+	if (pl.size() >= 2) {
+		if (pl[1].isNotEmpty()) addr.setIP(pl[1]);
+	}
+	if (pl.size() >= 3) {
+		if (pl[2].isNotEmpty()) addr.setPort(pl[2].toInt());
+	}
+	setAddress(addr);
+}
+
+
+ssize_t PIPackedTCP::readDevice(void * read_to, ssize_t max_size) {
+	PIMutexLocker ml(rec_mutex);
+	if (rec_queue.isNotEmpty()) {
+		auto d  = rec_queue.dequeue();
+		auto sz = piMin(max_size, d.size_s());
+		if (read_to) memcpy(read_to, d.data(), sz);
+		return sz;
+	}
+	return 0;
+}
+
+
+ssize_t PIPackedTCP::writeDevice(const void * data, ssize_t max_size) {
+	if (!isConnected()) return 0;
+	packer.send(PIByteArray(data, max_size));
+	// piCout << m_role << "write" << eth;
+	return max_size;
+	/*if (m_role == Client) {
+		return eth->write(data, max_size);
+	} else {
+		if (client) return client->write(data, max_size);
+	}*/
+}
+
+
+bool PIPackedTCP::openDevice() {
+	if (m_role == Client) {
+		if (eth->isConnected()) return true;
+		if (eth->isConnecting()) return false;
+		packer.clear();
+		bool ret = eth->connect(path(), false);
+		eth->startThreadedRead();
+		return ret;
+	} else {
+		return eth->listen(path(), false);
+	}
+	return false;
+}
+
+
+bool PIPackedTCP::closeDevice() {
+	if (client) {
+		client->close();
+		client->stopAndWait();
+		piDeleteSafety(client);
+		packer.assignDevice(nullptr);
+	}
+	return eth->close();
+}

libs/io_utils/pistreampacker.cpp

@@ -22,7 +22,9 @@
 #  pragma GCC diagnostic ignored "-Wnonnull"
 #endif
 #include "pistreampacker.h"
+
 #include "piiodevice.h"
+#include "piliterals_bytes.h"
 #ifdef __GNUC__
 #  pragma GCC diagnostic pop
 #endif
@@ -51,7 +53,7 @@ PIStreamPacker::PIStreamPacker(PIIODevice * dev): PIObject() {
 	aggressive_optimization = true;
 	packet_size             = -1;
 	size_crypted_size       = sizeof(int);
-	crypt_frag_size = 1024*1024;
+	crypt_frag_size         = 1_MiB;
 	max_packet_size         = 1400;
 	packet_sign             = 0xAFBE;
 	assignDevice(dev);
@@ -61,7 +63,8 @@ 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);
@@ -83,8 +86,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);
+			if (i == fcnt - 1)
-			else frag = PIByteArray(data.data(fst), crypt_frag_size);
+				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);
 		}
@@ -95,15 +100,18 @@ 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;
 	for (int i = 0; i < pcnt; ++i) {
-		if (i == pcnt - 1) part = PIByteArray(cd.data(pst), cd.size_s() - pst);
+		if (i == pcnt - 1)
-		else part = PIByteArray(cd.data(pst), max_packet_size);
+			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;
@@ -111,7 +119,8 @@ void PIStreamPacker::send(const PIByteArray & data) {
 }
 
 
-void PIStreamPacker::received(uchar * readed, int size) {
+void PIStreamPacker::received(const uchar * readed, ssize_t size) {
+	if (size <= 0) return;
 	received(PIByteArray(readed, size));
 }
 
@@ -126,8 +135,10 @@ void PIStreamPacker::received(const PIByteArray & data) {
 			ushort sign(0);
 			memcpy(&sign, stream.data(), 2);
 			if (sign != packet_sign) {
-				if (aggressive_optimization) stream.clear();
+				if (aggressive_optimization)
-				else stream.pop_front();
+					stream.clear();
+				else
+					stream.pop_front();
 				continue;
 			}
 			int sz = -1;
@@ -136,8 +147,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();
+					if (aggressive_optimization)
-					else stream.pop_front();
+						stream.clear();
+					else
+						stream.pop_front();
 					continue;
 				}
 				crsz >> sz;
@@ -145,8 +158,10 @@ void PIStreamPacker::received(const PIByteArray & data) {
 				memcpy(&sz, stream.data(2), size_crypted_size);
 			}
 			if (sz < 0) {
-				if (aggressive_optimization) stream.clear();
+				if (aggressive_optimization)
-				else stream.pop_front();
+					stream.clear();
+				else
+					stream.pop_front();
 				continue;
 			}
 			stream.remove(0, hdr_size);
@@ -154,6 +169,8 @@ void PIStreamPacker::received(const PIByteArray & data) {
 			packet_size = sz;
 			if (packet_size == 0)
 				packet_size = -1;
+			else
+				startPacketReceive(packet_size);
 			continue;
 		} else {
 			int ps = piMini(stream.size_s(), packet_size - packet.size_s());
@@ -182,6 +199,7 @@ void PIStreamPacker::received(const PIByteArray & data) {
 				}
 				// piCout << "decrypt" << packet.size() << "->" << cd.size() << key().size();
 				if (!cd.isEmpty()) {
+					endPacketReceive();
 					packetReceived(cd);
 					packetReceiveEvent(cd);
 				}
@@ -195,8 +213,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);
+	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/application/piapplicationmodule.h

@@ -0,0 +1,58 @@
+/*
+    PIP - Platform Independent Primitives
+    Module includes
+    Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@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/>.
+*/
+//! \defgroup Application Application
+//! \~\brief
+//! \~english Application-level classes.
+//! \~russian Классы уровня "приложение".
+//!
+//! \~\details
+//! \~english \section cmake_module_Application Building with CMake
+//! \~russian \section cmake_module_Application Сборка с использованием CMake
+//!
+//! \~\code
+//! find_package(PIP REQUIRED)
+//! target_link_libraries([target] PIP)
+//! \endcode
+//!
+//! \~english \par Common
+//! \~russian \par Общее
+//!
+//! \~english
+//! These files provides some classes for help to create application
+//!
+//! \~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 PIAPPLICATIONMODULE_H
+#define PIAPPLICATIONMODULE_H
+
+#include "picli.h"
+#include "pisingleapplication.h"
+#include "pisystemmonitor.h"
+
+#endif

libs/main/application/picli.cpp

@@ -0,0 +1,255 @@
+/*
+    PIP - Platform Independent Primitives
+    Command-Line Parser
+    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 "picli.h"
+
+#include "pisysteminfo.h"
+
+
+//! \class PICLI picli.h
+//! \details
+//! \~english \section PICLI_sec0 Synopsis
+//! \~russian \section PICLI_sec0 Краткий обзор
+//! \~english
+//! This class provide handy parsing of command-line arguments. First you should add
+//! arguments to %PICLI with function \a addArgument(). Then you can check if there
+//! is some argument in application command-line with function \a hasArgument(),
+//! or obtain argument value by \a argumentValue().
+//!
+//! \~russian
+//! Этот класс предоставляет удобный механизм для разбора аргументов командной строки.
+//! Сперва необходимо добавить аргументы в %PICLI с помощью методов \a addArgument().
+//! Далее можно проверять аргументы на наличие в командной строке методом \a hasArgument(),
+//! а также получать их значения при помощи \a argumentValue().
+//!
+//! \~english \section PICLI_sec1 Example
+//! \~russian \section PICLI_sec1 Пример
+//! \~\code
+//! 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;
+//! }
+//! \endcode
+//!
+//! \~english These executions are similar:
+//! \~russian Эти вызовы будут идентичны:
+//!
+//! \~\code
+//! 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
+//! \endcode
+//!
+
+
+PICLI::PICLI(int argc, char * argv[]) {
+	for (int i = 0; i < argc; ++i)
+		_args_raw << argv[i];
+	if (argc > 0) PISystemInfo::instance()->execCommand = argv[0];
+}
+
+
+void PICLI::parse() {
+	if (!needParse) return;
+	PIString cra, full;
+	Argument * last = 0;
+	for (int i = 1; i < _args_raw.size_s(); ++i) {
+		cra = _args_raw[i];
+		if (cra.left(2) == _prefix_full) {
+			last = 0;
+			full = cra.right(cra.length() - 2);
+			for (auto & a: _args) {
+				if (a.full_key == full) {
+					a.found = true;
+					last    = &a;
+					break;
+				}
+			}
+		} else {
+			if (cra.left(1) == _prefix_short) {
+				last = 0;
+				for (int j = 1; j < cra.length(); ++j) {
+					bool found = false;
+					for (auto & a: _args) {
+						if ((a.short_key != '\0') && (a.short_key == cra[j])) {
+							a.found = true;
+							last    = &a;
+							found   = true;
+							break;
+						}
+					}
+					if (!found) break;
+				}
+			} else {
+				if (last == 0 ? true : !last->has_value) {
+					if (_args_mand.size_s() < _count_mand) {
+						_args_mand << cra;
+						continue;
+					}
+					if (_args_opt.size_s() < _count_opt || _count_opt < 0) {
+						_args_opt << cra;
+						continue;
+					}
+					piCoutObj << "Arguments overflow, \"" << cra << "\" ignored";
+				}
+				if (last == 0 ? false : last->has_value) {
+					last->value = cra;
+					last        = 0;
+				}
+			}
+		}
+	}
+	needParse = false;
+}
+
+
+void PICLI::addArgument(const PIString & name, bool value) {
+	_args << Argument(name, name[0], name, value);
+	needParse = true;
+}
+
+
+void PICLI::addArgument(const PIString & name, const PIChar & shortKey, bool value) {
+	_args << Argument(name, shortKey, name, value);
+	needParse = true;
+}
+
+
+void PICLI::addArgument(const PIString & name, const char * shortKey, bool value) {
+	_args << Argument(name, PIChar::fromUTF8(shortKey), name, value);
+	needParse = true;
+}
+
+
+void PICLI::addArgument(const PIString & name, const PIChar & shortKey, const PIString & fullKey, bool value) {
+	_args << Argument(name, shortKey, fullKey, value);
+	needParse = true;
+}
+
+
+void PICLI::addArgument(const PIString & name, const char * shortKey, const PIString & fullKey, bool value) {
+	_args << Argument(name, PIChar::fromUTF8(shortKey), fullKey, value);
+	needParse = true;
+}
+
+
+PIString PICLI::rawArgument(int index) {
+	parse();
+	return _args_raw[index];
+}
+
+
+PIString PICLI::mandatoryArgument(int index) {
+	parse();
+	return _args_mand[index];
+}
+
+
+PIString PICLI::optionalArgument(int index) {
+	parse();
+	return _args_opt[index];
+}
+
+
+const PIStringList & PICLI::rawArguments() {
+	parse();
+	return _args_raw;
+}
+
+
+const PIStringList & PICLI::mandatoryArguments() {
+	parse();
+	return _args_mand;
+}
+
+
+const PIStringList & PICLI::optionalArguments() {
+	parse();
+	return _args_opt;
+}
+
+
+PIString PICLI::programCommand() {
+	parse();
+	return _args_raw.isNotEmpty() ? _args_raw.front() : PIString();
+}
+
+
+bool PICLI::hasArgument(const PIString & name) {
+	parse();
+	for (const auto & i: _args)
+		if (i.name == name && i.found) return true;
+	return false;
+}
+
+
+PIString PICLI::argumentValue(const PIString & name) {
+	parse();
+	for (const auto & i: _args)
+		if (i.name == name && i.found) return i.value;
+	return PIString();
+}
+
+
+PIString PICLI::argumentShortKey(const PIString & name) {
+	for (const auto & i: _args)
+		if (i.name == name) return PIString(i.short_key);
+	return PIString();
+}
+
+
+PIString PICLI::argumentFullKey(const PIString & name) {
+	for (const auto & i: _args)
+		if (i.name == name) return i.full_key;
+	return PIString();
+}
+
+
+void PICLI::setShortKeyPrefix(const PIString & prefix) {
+	_prefix_short = prefix;
+	needParse     = true;
+}
+
+
+void PICLI::setFullKeyPrefix(const PIString & prefix) {
+	_prefix_full = prefix;
+	needParse    = true;
+}
+
+
+void PICLI::setMandatoryArgumentsCount(const int count) {
+	_count_mand = count;
+	needParse   = true;
+}
+
+
+void PICLI::setOptionalArgumentsCount(const int count) {
+	_count_opt = count;
+	needParse  = true;
+}

libs/main/application/picli.h

@@ -0,0 +1,136 @@
+/*! \file picli.h
+ * \ingroup Application
+ * \~\brief
+ * \~english Command-Line parser
+ * \~russian Парсер командной строки
+ */
+/*
+    PIP - Platform Independent Primitives
+    Command-Line Parser
+    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/>.
+*/
+
+#ifndef PICLI_H
+#define PICLI_H
+
+#include "piset.h"
+#include "pistringlist.h"
+
+//! \ingroup Application
+//! \~\brief
+//! \~english Command-Line parser.
+//! \~russian Парсер командной строки.
+class PIP_EXPORT PICLI {
+public:
+	//! \~english Constructs %PICLI from "argc" and "argv" from "int main()" method.
+	//! \~russian Создает %PICLI из "argc" и "argv" из метода "int main()".
+	PICLI(int argc, char * argv[]);
+
+
+	//! \~english Add argument with name "name", short key = name first letter and full key = name.
+	//! \~russian Добавляет аргумент с именем "name", коротким ключом = первой букве имени и полным ключом = имени.
+	void addArgument(const PIString & name, bool value = false);
+
+	//! \~english Add argument with name "name", short key = "shortKey" and full key = name.
+	//! \~russian Добавляет аргумент с именем "name", коротким ключом = "shortKey" и полным ключом = имени.
+	void addArgument(const PIString & name, const PIChar & shortKey, bool value = false);
+
+	//! \~english Add argument with name "name", short key = "shortKey" and full key = name.
+	//! \~russian Добавляет аргумент с именем "name", коротким ключом = "shortKey" и полным ключом = имени.
+	void addArgument(const PIString & name, const char * shortKey, bool value = false);
+
+	//! \~english Add argument with name "name", short key = "shortKey" and full key = "fullKey".
+	//! \~russian Добавляет аргумент с именем "name", коротким ключом = "shortKey" и полным ключом = "fullKey".
+	void addArgument(const PIString & name, const PIChar & shortKey, const PIString & fullKey, bool value = false);
+
+	//! \~english Add argument with name "name", short key = "shortKey" and full key = "fullKey".
+	//! \~russian Добавляет аргумент с именем "name", коротким ключом = "shortKey" и полным ключом = "fullKey".
+	void addArgument(const PIString & name, const char * shortKey, const PIString & fullKey, bool value = false);
+
+
+	//! \~english Returns unparsed command-line argument by index "index". Index 0 is program execute command.
+	//! \~russian Возвращает исходный аргумент командной строки по индексу "index". Индекс 0 это команда вызова программы.
+	PIString rawArgument(int index);
+	PIString mandatoryArgument(int index);
+	PIString optionalArgument(int index);
+
+	//! \~english Returns unparsed command-line arguments.
+	//! \~russian Возвращает исходные аргументы командной строки.
+	const PIStringList & rawArguments();
+	const PIStringList & mandatoryArguments();
+	const PIStringList & optionalArguments();
+
+	//! \~english Returns program execute command without arguments.
+	//! \~russian Возвращает команду вызова программы без аргументов.
+	PIString programCommand();
+
+	//! \~english Returns if argument "name" found.
+	//! \~russian Возвращает найден ли аргумент "name".
+	bool hasArgument(const PIString & name);
+
+	//! \~english Returns argument "name" value, or empty string if this is no value.
+	//! \~russian Возвращает значение аргумента "name" или пустую строку, если значения нет.
+	PIString argumentValue(const PIString & name);
+
+	//! \~english Returns short key of argument "name", or empty string if this is no argument.
+	//! \~russian Возвращает короткий ключ аргумента "name" или пустую строку, если аргумента нет.
+	PIString argumentShortKey(const PIString & name);
+
+	//! \~english Returns full key of argument "name", or empty string if this is no argument.
+	//! \~russian Возвращает полный ключ аргумента "name" или пустую строку, если аргумента нет.
+	PIString argumentFullKey(const PIString & name);
+
+	const PIString & shortKeyPrefix() const { return _prefix_short; }
+	const PIString & fullKeyPrefix() const { return _prefix_full; }
+	int mandatoryArgumentsCount() const { return _count_mand; }
+	int optionalArgumentsCount() const { return _count_opt; }
+	void setShortKeyPrefix(const PIString & prefix);
+	void setFullKeyPrefix(const PIString & prefix);
+	void setMandatoryArgumentsCount(const int count);
+	void setOptionalArgumentsCount(const int count);
+
+	bool debug() const { return debug_; }
+	void setDebug(bool debug) { debug_ = debug; }
+	PIConstChars className() const { return "PICLI"; }
+	PIString name() const { return PIStringAscii("CLI"); }
+
+private:
+	struct Argument {
+		Argument() {}
+		Argument(const PIString & n, const PIChar & s, const PIString & f, bool v) {
+			name      = n;
+			short_key = s;
+			full_key  = f;
+			has_value = v;
+		}
+		PIString name;
+		PIChar short_key;
+		PIString full_key;
+		PIString value;
+		bool has_value = false, found = false;
+	};
+
+	void parse();
+
+	PIString _prefix_short = "-", _prefix_full = "--";
+	PIStringList _args_raw, _args_mand, _args_opt;
+	PISet<PIString> keys_full, keys_short;
+	PIVector<Argument> _args;
+	int _count_mand = 0, _count_opt = 0;
+	bool needParse = true, debug_ = true;
+};
+
+#endif // PICLI_H

libs/main/application/pilog.cpp

@@ -0,0 +1,229 @@
+/*
+    PIP - Platform Independent Primitives
+	High-level log
+    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 "pilog.h"
+
+#include "pidir.h"
+#include "piliterals_string.h"
+#include "piliterals_time.h"
+#include "pitime.h"
+
+
+//! \class PILog pilog.h
+//! \details
+//! \~english \section PILog_sec0 Synopsis
+//! \~russian \section PILog_sec0 Краткий обзор
+//! \~english
+//! This class provide handy parsing of command-line arguments. First you should add
+//! arguments to %PICLI with function \a addArgument(). Then you can check if there
+//! is some argument in application command-line with function \a hasArgument(),
+//! or obtain argument value by \a argumentValue().
+//!
+//! \~russian
+//! Этот класс предоставляет удобный механизм для разбора аргументов командной строки.
+//! Сперва необходимо добавить аргументы в %PICLI с помощью методов \a addArgument().
+//! Далее можно проверять аргументы на наличие в командной строке методом \a hasArgument(),
+//! а также получать их значения при помощи \a argumentValue().
+//!
+//! \~english \section PICLI_sec1 Example
+//! \~russian \section PICLI_sec1 Пример
+//! \~\code
+//! 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;
+//! }
+//! \endcode
+//!
+//! \~english These executions are similar:
+//! \~russian Эти вызовы будут идентичны:
+//!
+//! \~\code
+//! 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
+//! \endcode
+//!
+
+
+PILog::PILog(): PIThread(), log_ts(&log_file) {
+	setName("PILog");
+	split_time       = 8_h;
+	timestamp_format = "yyyy-MM-dd hh:mm:ss.zzz";
+	setLineFormat("t - c: m");
+	id_by_cat[Level::Info]    = PICout::registerExternalBufferID();
+	id_by_cat[Level::Debug]   = PICout::registerExternalBufferID();
+	id_by_cat[Level::Warning] = PICout::registerExternalBufferID();
+	id_by_cat[Level::Error]   = PICout::registerExternalBufferID();
+	CONNECTU(PICout::Notifier::object(), finished, this, coutDone);
+}
+
+
+PILog::~PILog() {
+	stop();
+}
+
+
+void PILog::setDir(const PIString & d) {
+	stopAndWait();
+	log_dir = d;
+	if (output[File]) {
+		PIDir::make(log_dir);
+		newFile();
+	}
+	start();
+}
+
+
+void PILog::setLineFormat(const PIString & f) {
+	line_format   = f;
+	line_format_p = line_format;
+	line_format_p.replace("t", "${t}").replace("c", "${c}").replace("m", "${m}");
+}
+
+
+void PILog::setLevel(Level l) {
+	max_level = l;
+}
+
+
+PICout PILog::error(PIObject * context) {
+	return makePICout(context, Level::Error);
+}
+
+
+PICout PILog::warning(PIObject * context) {
+	return makePICout(context, Level::Warning);
+}
+
+
+PICout PILog::info(PIObject * context) {
+	return makePICout(context, Level::Info);
+}
+
+
+PICout PILog::debug(PIObject * context) {
+	return makePICout(context, Level::Debug);
+}
+
+
+void PILog::stop() {
+	while (true) {
+		log_mutex.lock();
+		bool done = queue.isEmpty();
+		log_mutex.unlock();
+		if (done) break;
+		piMinSleep();
+	}
+	PIThread::stopAndWait();
+}
+
+
+void PILog::coutDone(int id, PIString * buffer) {
+	if (!buffer) return;
+	if (!id_by_cat.containsValue(id)) return;
+	auto cat = id_by_cat.key(id, PILog::Level::Debug);
+	if (cat > max_level) return;
+	enqueue(*buffer, cat);
+	delete buffer;
+}
+
+
+PICout PILog::makePICout(PIObject * context, Level cat) {
+	auto buffer = new PIString();
+	if (context) {
+		*buffer = "["_a + context->className();
+		if (context->name().isNotEmpty()) *buffer += " \"" + context->name() + "\"";
+		*buffer += "] ";
+	}
+	return PICout::withExternalBuffer(buffer, id_by_cat.value(cat), PICoutManipulators::AddSpaces);
+}
+
+
+void PILog::enqueue(const PIString & msg, Level cat) {
+	auto t = PIDateTime::fromSystemTime(PISystemTime::current());
+	PIMutexLocker ml(log_mutex);
+	queue.enqueue({cat, t, msg});
+}
+
+
+PIString PILog::entryToString(const Entry & e) const {
+	static PIStringList categories{"error", "warn ", "info ", "debug"};
+	PIString t   = e.time.toString(timestamp_format);
+	PIString ret = line_format_p;
+	ret.replace("${t}", t).replace("${c}", categories[static_cast<int>(e.cat)]).replace("${m}", e.msg);
+	return ret;
+}
+
+
+void PILog::newFile() {
+	PIString aname = log_name;
+	if (aname.isNotEmpty()) aname += "__";
+	log_file.open(log_dir + "/" + aname + PIDateTime::current().toString("yyyy_MM_dd__hh_mm_ss") + ".log." +
+					  PIString::fromNumber(++part_number),
+				  PIIODevice::ReadWrite);
+}
+
+
+void PILog::run() {
+	if (output[File]) {
+		if (split_tm.elapsed() >= split_time) {
+			split_tm.reset();
+			newFile();
+		}
+	}
+	log_mutex.lock();
+	if (queue.isEmpty()) {
+		log_mutex.unlock();
+		piMSleep(20);
+		return;
+	}
+	log_mutex.unlock();
+	while (true) {
+		log_mutex.lock();
+		if (queue.isEmpty()) {
+			log_mutex.unlock();
+			return;
+		}
+		auto qi = queue.dequeue();
+		log_mutex.unlock();
+		auto str = entryToString(qi);
+		if (log_file.isOpened()) log_ts << str << "\n";
+		if (output[Console]) {
+			PICout out(qi.cat == Level::Error ? piCerr : piCout);
+			if (color_console) {
+				switch (qi.cat) {
+				case Level::Error: out << PICoutManipulators::Red; break;
+				case Level::Warning: out << PICoutManipulators::Yellow; break;
+				default: break;
+				}
+			}
+			out << str;
+		}
+	}
+}

libs/main/application/pilog.h

@@ -0,0 +1,152 @@
+/*! \file pilog.h
+ * \ingroup Application
+ * \~\brief
+ * \~english High-level log
+ * \~russian Высокоуровневый лог
+ */
+/*
+    PIP - Platform Independent Primitives
+	High-level log
+    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/>.
+*/
+
+#ifndef PIlog_H
+#define PIlog_H
+
+#include "pifile.h"
+#include "piiostream.h"
+#include "pithread.h"
+
+//! \ingroup Application
+//! \~\brief
+//! \~english High-level log
+//! \~russian Высокоуровневый лог
+class PIP_EXPORT PILog: public PIThread {
+	PIOBJECT_SUBCLASS(PILog, PIThread)
+
+public:
+	PILog();
+	~PILog();
+
+	enum class Level {
+		Error,
+		Warning,
+		Info,
+		Debug,
+	};
+
+	enum Output {
+		File    = 0x1,
+		Console = 0x2,
+		All     = 0xFF,
+	};
+
+	//! \~english Set output target \"o\" to \"on\".
+	void setOutput(Output o, bool on = true) { output.setFlag(o, on); }
+
+	//! \~english Returns prefix for filename.
+	PIString logName() const { return log_name; }
+
+	//! \~english Set prefix for filename. Should be set \b before \a setDir()!
+	void setLogName(const PIString & n) { log_name = n; }
+
+	//! \~english Returns if color for console output enabled.
+	bool colorConsole() const { return color_console; }
+
+	//! \~english Set color for console output enabled. True by default.
+	void setColorConsole(bool yes) { color_console = yes; }
+
+
+	//! \~english Returns directory for log files.
+	PIString dir() const { return log_dir; }
+
+	//! \~english Set directory for log files. Should be set \b after \a setApplicationName()!
+	void setDir(const PIString & d);
+
+
+	//! \~english Returns lifetime for file.
+	PISystemTime fileSplitTime() const { return split_time; }
+
+	//! \~english Set lifetime for file. Each "st" interval new file will be created.
+	void setFileSplitTime(PISystemTime st) { split_time = st; }
+
+
+	//! \~english Returns timestamp format for line.
+	PIString timestampFormat() const { return timestamp_format; }
+
+	//! \~english Set timestamp format for line. Default is "yyyy-MM-dd hh:mm:ss.zzz".
+	void setTimestampFormat(const PIString & f) { timestamp_format = f; }
+
+
+	//! \~english Returns line format.
+	PIString lineFormat() const { return line_format; }
+
+	//! \~english Set line format. "t" is timestamp, "c" is category and "m" is message. Default is "t - c: m".
+	void setLineFormat(const PIString & f);
+
+
+	//! \~english Returns maximum level.
+	Level level() const { return max_level; }
+
+	//! \~english Set maximum level. All levels greater than \"l\" will be ignored. Default if \a Level::Debug.
+	void setLevel(Level l);
+
+	//! \~english Returns PICout for Level::Error level.
+	PICout error(PIObject * context = nullptr);
+
+	//! \~english Returns PICout for Level::Warning level.
+	PICout warning(PIObject * context = nullptr);
+
+	//! \~english Returns PICout for Level::Info level.
+	PICout info(PIObject * context = nullptr);
+
+	//! \~english Returns PICout for Level::Debug level.
+	PICout debug(PIObject * context = nullptr);
+
+	//! \~english Write all queued lines and stop. Also called in destructor.
+	void stop();
+
+private:
+	EVENT_HANDLER2(void, coutDone, int, id, PIString *, buff);
+
+	PICout makePICout(PIObject * context, Level cat);
+	void enqueue(const PIString & msg, Level cat = Level::Debug);
+
+	struct Entry {
+		Level cat;
+		PIDateTime time;
+		PIString msg;
+	};
+
+	PIString entryToString(const Entry & e) const;
+	void newFile();
+	void run() override;
+
+	PIMutex log_mutex;
+	PIFile log_file;
+	PIIOTextStream log_ts;
+	PITimeMeasurer split_tm;
+	PISystemTime split_time;
+	PIString log_dir, timestamp_format, line_format, line_format_p, log_name;
+	PIQueue<Entry> queue;
+	PIMap<Level, int> id_by_cat;
+	Level max_level        = Level::Debug;
+	PIFlags<Output> output = All;
+	bool color_console     = true;
+	int part_number = -1, cout_id = -1;
+};
+
+#endif

libs/main/application/pisingleapplication.cpp

@@ -18,7 +18,11 @@
 */
 
 #include "pisingleapplication.h"
+
+#include "piliterals_bytes.h"
+#include "piliterals_time.h"
 #include "pisharedmemory.h"
+#include "pitime.h"
 
 
 //! \class PISingleApplication pisingleapplication.h
@@ -60,7 +64,7 @@
 //!
 
 
-#define SHM_SIZE 1024*32
+#define SHM_SIZE 32_KiB
 
 
 PISingleApplication::PISingleApplication(const PIString & app_name): PIThread() {
@@ -68,14 +72,13 @@ PISingleApplication::PISingleApplication(const PIString & app_name): PIThread()
 	started = false;
 	sacnt   = 0;
 	shm     = new PISharedMemory("sa_" + app_name, SHM_SIZE);
-	start(100);
+	start(10_Hz);
 }
 
 
 PISingleApplication::~PISingleApplication() {
 	stop();
-	if (!waitForFinish(5000))
+	if (!waitForFinish(5_s)) terminate();
-		terminate();
 	delete shm;
 }
 
@@ -133,7 +136,7 @@ void PISingleApplication::run() {
 		shm->read(readed.data(), readed.size(), hdr_sz);
 		PIByteArray msg;
 		readed >> msg;
-		if (!msg.isEmpty()) {
+		if (msg.isNotEmpty()) {
 			messageReceived(msg);
 			// piCoutObj << "message" << msg;
 		}

libs/main/application/pisingleapplication.h

@@ -1,5 +1,5 @@
 /*! \file pisingleapplication.h
- * \ingroup System
+ * \ingroup Application
  * \~\brief
  * \~english Single-instance application control
  * \~russian Контроль одного экземпляра приложения
@@ -30,14 +30,14 @@
 
 class PISharedMemory;
 
-//! \ingroup System
+//! \ingroup Application
 //! \~\brief
 //! \~english Single-instance application control.
 //! \~russian Контроль одного экземпляра приложения.
 class PIP_EXPORT PISingleApplication: public PIThread {
-	PIOBJECT_SUBCLASS(PISingleApplication, PIThread)
+	PIOBJECT_SUBCLASS(PISingleApplication, PIThread);
-public:
 
+public:
 	//! \~english Construct %PISingleApplication with name "app_name"
 	//! \~russian Создает %PISingleApplication с именем "app_name"
 	PISingleApplication(const PIString & app_name = PIString());
@@ -50,7 +50,7 @@ public:
 	bool isFirst() const;
 
 	EVENT_HANDLER1(void, sendMessage, const PIByteArray &, m);
-	EVENT1(messageReceived, PIByteArray, m)
+	EVENT1(messageReceived, PIByteArray, m);
 
 	//! \handlers
 	//! \{
@@ -72,8 +72,8 @@ public:
 	//! \}
 
 private:
-	void begin();
+	void begin() override;
-	void run();
+	void run() override;
 	void waitFirst() const;
 
 	PISharedMemory * shm;
@@ -81,7 +81,6 @@ private:
 	PIByteArray readed;
 	bool first, started;
 	int sacnt;
-
 };
 
 #endif // PISINGLEAPPLICATION_H

libs/main/application/pisystemmonitor.cpp

@@ -17,11 +17,14 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "piincludes_p.h"
 #include "pisystemmonitor.h"
-#include "pisysteminfo.h"
+
-#include "piprocess.h"
+#include <unistd.h>
+
 #include "pidir.h"
+#include "piliterals_string.h"
+#include "piprocess.h"
+#include "pisysteminfo.h"
 #include "pitime_win.h"
 #ifdef WINDOWS
 #  include <psapi.h>
@@ -54,7 +57,8 @@ PRIVATE_DEFINITION_START(PISystemMonitor)
 #	else
 	llong
 #	endif
-				cpu_u_cur, cpu_u_prev, cpu_s_cur, cpu_s_prev;
+		cpu_u_cur,
+		cpu_u_prev, cpu_s_cur, cpu_s_prev;
 	PIString proc_dir;
 	PIFile file, filem;
 #  else
@@ -82,7 +86,7 @@ PISystemMonitor::PISystemMonitor(): PIThread() {
 	PRIVATE->mem_cnt.cb = sizeof(PRIVATE->mem_cnt);
 #  endif
 #endif
-	setName("system_monitor");
+	setName("system_monitor"_a);
 }
 
 
@@ -92,7 +96,7 @@ PISystemMonitor::~PISystemMonitor() {
 
 
 #ifndef MICRO_PIP
-bool PISystemMonitor::startOnProcess(int pID, int interval_ms) {
+bool PISystemMonitor::startOnProcess(int pID, PISystemTime interval) {
 	stop();
 	pID_ = pID;
 	Pool::instance()->add(this);
@@ -115,17 +119,17 @@ bool PISystemMonitor::startOnProcess(int pID, int interval_ms) {
 	}
 	PRIVATE->tm.reset();
 #  endif
-	return start(interval_ms);
+	return start(interval);
 }
 #endif
 
 
-bool PISystemMonitor::startOnSelf(int interval_ms) {
+bool PISystemMonitor::startOnSelf(PISystemTime interval) {
 #ifndef MICRO_PIP
-	bool ret = startOnProcess(PIProcess::currentPID(), interval_ms);
+	bool ret = startOnProcess(PIProcess::currentPID(), interval);
 	cycle    = -1;
 #else
-	bool ret = start(interval_ms);
+	bool ret        = start(interval);
 #endif
 	return ret;
 }
@@ -147,7 +151,7 @@ void PISystemMonitor::setStatistic(const PISystemMonitor::ProcessStats & s) {
 
 
 void PISystemMonitor::stop() {
-	PIThread::stop();
+	PIThread::stopAndWait();
 #ifdef WINDOWS
 	if (PRIVATE->hProc != 0) {
 		CloseHandle(PRIVATE->hProc);
@@ -177,18 +181,17 @@ void PISystemMonitor::run() {
 	pitc->lock();
 	PIVector<PIThread *> tv = pitc->threads();
 	piForeach(PIThread * t, tv)
-		if (t->isPIObject())
+		if (t->isPIObject()) tbid[t->tid()] = t->name();
-			tbid[t->tid()] = t->name();
 	pitc->unlock();
 	// piCout << tbid.keys().toType<uint>();
 	ProcessStats tstat;
 	tstat.ID = pID_;
 #ifdef MICRO_PIP
 	piForeach(PIThread * t, tv)
-		if (t->isPIObject())
+		if (t->isPIObject()) gatherThread(t->tid());
-			gatherThread(t->tid());
 #else
 #  ifndef WINDOWS
+	double delay_ms = delay_.toMilliseconds();
 	tbid[pID_]      = "main";
 #	ifdef MAC_OS
 	rusage_info_current ru;
@@ -202,13 +205,13 @@ void PISystemMonitor::run() {
 	PRIVATE->cpu_s_prev   = PRIVATE->cpu_s_cur;
 	PRIVATE->cpu_u_cur    = uint64toST(ru.ri_user_time);
 	PRIVATE->cpu_s_cur    = uint64toST(ru.ri_system_time);
-	tstat.cpu_load_system = 100.f * (PRIVATE->cpu_s_cur - PRIVATE->cpu_s_prev).toMilliseconds() / delay_;
+	tstat.cpu_load_system = 100.f * (PRIVATE->cpu_s_cur - PRIVATE->cpu_s_prev).toMilliseconds() / delay_ms;
-	tstat.cpu_load_user = 100.f * (PRIVATE->cpu_u_cur - PRIVATE->cpu_u_prev).toMilliseconds() / delay_;
+	tstat.cpu_load_user   = 100.f * (PRIVATE->cpu_u_cur - PRIVATE->cpu_u_prev).toMilliseconds() / delay_ms;
 	cycle                 = 0;
-	//piCout << (PRIVATE->cpu_u_cur - PRIVATE->cpu_u_prev).toMilliseconds() / delay_;
+	// piCout << (PRIVATE->cpu_u_cur - PRIVATE->cpu_u_prev).toMilliseconds() / delay_ms;
 #	else
 	PRIVATE->file.seekToBegin();
-	PIString str(PRIVATE->file.readAll(true));
+	PIString str = PIString::fromAscii(PRIVATE->file.readAll(true));
 	int si = str.find('(') + 1, fi = 0, cc = 1;
 	for (int i = si; i < str.size_s(); ++i) {
 		if (str[i] == '(') cc++;
@@ -235,8 +238,8 @@ void PISystemMonitor::run() {
 	PRIVATE->cpu_s_prev   = PRIVATE->cpu_s_cur;
 	PRIVATE->cpu_u_cur    = sl[12].toLLong();
 	PRIVATE->cpu_s_cur    = sl[13].toLLong();
-	tstat.cpu_load_system = (PRIVATE->cpu_s_cur - PRIVATE->cpu_s_prev) / (delay_ / 1000.);
+	tstat.cpu_load_system = (PRIVATE->cpu_s_cur - PRIVATE->cpu_s_prev) / (delay_ms / 1000.);
-	tstat.cpu_load_user = (PRIVATE->cpu_u_cur - PRIVATE->cpu_u_prev) / (delay_ / 1000.);
+	tstat.cpu_load_user   = (PRIVATE->cpu_u_cur - PRIVATE->cpu_u_prev) / (delay_ms / 1000.);
 	tstat.cpu_load_system /= cpu_count;
 	tstat.cpu_load_user /= cpu_count;
 	cycle          = 0;
@@ -246,7 +249,7 @@ void PISystemMonitor::run() {
 	// piCout << sl[0] << sl[12] << sl[13];
 
 	PRIVATE->filem.seekToBegin();
-	str = PRIVATE->filem.readAll(true);
+	str = PIString::fromAscii(PRIVATE->filem.readAll(true));
 	sl  = str.split(" ");
 	if (sl.size_s() < 6) return;
 	tstat.virtual_memsize          = sl[0].toLong() * page_size;
@@ -257,8 +260,7 @@ void PISystemMonitor::run() {
 
 	PIVector<PIFile::FileInfo> tld = PIDir(PRIVATE->proc_dir + "task").entries();
 	piForeachC(PIFile::FileInfo & i, tld) {
-		if (i.flags[PIFile::FileInfo::Dot] || i.flags[PIFile::FileInfo::DotDot])
+		if (i.flags[PIFile::FileInfo::Dot] || i.flags[PIFile::FileInfo::DotDot]) continue;
-			continue;
 		gatherThread(i.name().toInt());
 	}
 #	endif
@@ -321,7 +323,7 @@ void PISystemMonitor::run() {
 	auto i                = cur_tm.makeIterator();
 	while (i.next()) {
 		if (!last_tm.contains(i.key())) continue;
-		ThreadStats & ts_new(i.valueRef());
+		ThreadStats & ts_new(i.value());
 		ThreadStats & ts_old(last_tm[i.key()]);
 		ts_new.cpu_load_kernel = calcThreadUsage(ts_new.kernel_time, ts_old.kernel_time);
 		ts_new.cpu_load_user   = calcThreadUsage(ts_new.user_time, ts_old.user_time);
@@ -352,9 +354,8 @@ void PISystemMonitor::gatherThread(llong id) {
 #  ifndef WINDOWS
 	PIFile f(PRIVATE->proc_dir + "task/" + PIString::fromNumber(id) + "/stat");
 	// piCout << f.path();
-	if (!f.open(PIIODevice::ReadOnly))
+	if (!f.open(PIIODevice::ReadOnly)) return;
-		return;
+	PIString str = PIString::fromAscii(f.readAll(true));
-	PIString str = f.readAll(true);
 	int si = str.find('(') + 1, fi = 0, cc = 1;
 	for (int i = si; i < str.size_s(); ++i) {
 		if (str[i] == '(') cc++;
@@ -395,8 +396,8 @@ void PISystemMonitor::gatherThread(llong id) {
 
 
 float PISystemMonitor::calcThreadUsage(PISystemTime & t_new, PISystemTime & t_old) {
-	if (delay_ <= 0) return -1.;
+	if (delay_.isNull()) return -1.;
-	return piClampf(100. * ((t_new - t_old).toMilliseconds() / delay_), 0.f, 100.f);
+	return piClampf(100. * ((t_new - t_old).toMilliseconds() / delay_.toMilliseconds()), 0.f, 100.f);
 }
 
 
@@ -433,8 +434,6 @@ ullong PISystemMonitor::usedRAM() {
 }
 
 
-
-
 PISystemMonitor::Pool * PISystemMonitor::Pool::instance() {
 	static Pool ret;
 	return &ret;
@@ -457,34 +456,3 @@ void PISystemMonitor::Pool::remove(PISystemMonitor * sm) {
 	PIMutexLocker _ml(mutex);
 	sysmons.remove(sm->pID());
 }
-
-
-
-
-PIByteArray & operator <<(PIByteArray & s, const PISystemMonitor::ProcessStats & v) {
-	s << PIByteArray::RawData(&v, sizeof(PISystemMonitor::ProcessStatsFixed))
-	  << v.exec_name << v.state;
-	return s;
-}
-
-
-PIByteArray & operator >>(PIByteArray & s, PISystemMonitor::ProcessStats & v) {
-	s >> PIByteArray::RawData(&v, sizeof(PISystemMonitor::ProcessStatsFixed))
-	  >> v.exec_name >> v.state;
-	v.makeStrings();
-	return s;
-}
-
-
-PIByteArray & operator <<(PIByteArray & s, const PISystemMonitor::ThreadStats & v) {
-	s << PIByteArray::RawData(&v, sizeof(PISystemMonitor::ThreadStatsFixed))
-	  << v.name;
-	return s;
-}
-
-
-PIByteArray & operator >>(PIByteArray & s, PISystemMonitor::ThreadStats & v) {
-	s >> PIByteArray::RawData(&v, sizeof(PISystemMonitor::ThreadStatsFixed))
-	  >> v.name;
-	return s;
-}

libs/main/application/pisystemmonitor.h

@@ -1,5 +1,5 @@
 /*! \file pisystemmonitor.h
- * \ingroup System
+ * \ingroup Application
  * \~\brief
  * \~english System resources monitoring
  * \~russian Мониторинг ресурсов системы
@@ -26,17 +26,18 @@
 #ifndef PISYSTEMMONITOR_H
 #define PISYSTEMMONITOR_H
 
-#include "pithread.h"
 #include "pifile.h"
+#include "pithread.h"
 
 
-//! \ingroup System
+//! \ingroup Application
 //! \~\brief
 //! \~english Process monitoring.
 //! \~russian Мониторинг процесса.
 class PIP_EXPORT PISystemMonitor: public PIThread {
-	PIOBJECT_SUBCLASS(PISystemMonitor, PIThread)
+	PIOBJECT_SUBCLASS(PISystemMonitor, PIThread);
 	friend class PIIntrospectionServer;
+
 public:
 	//! \~english Constructs unassigned %PISystemMonitor
 	//! \~russian Создает непривязанный %PISystemMonitor
@@ -45,12 +46,11 @@ public:
 	~PISystemMonitor();
 
 #pragma pack(push, 1)
-	//! \ingroup System
+	//! \ingroup Application
 	//! \~\brief
 	//! \~english Process statistics (fixed-size fields).
 	//! \~russian Статистика процесса (фиксированные поля).
 	struct PIP_EXPORT ProcessStatsFixed {
-
 		//! \~english PID
 		//! \~russian PID
 		int ID                  = 0;
@@ -116,12 +116,11 @@ public:
 		float cpu_load_user     = 0.f;
 	};
 
-	//! \ingroup System
+	//! \ingroup Application
 	//! \~\brief
 	//! \~english Thread statistics (fixed-size fields).
 	//! \~russian Статистика потока (фиксированные поля).
 	struct PIP_EXPORT ThreadStatsFixed {
-
 		//! \~english TID
 		//! \~russian TID
 		llong id = 0;
@@ -152,12 +151,11 @@ public:
 	};
 #pragma pack(pop)
 
-	//! \ingroup System
+	//! \ingroup Application
 	//! \~\brief
 	//! \~english Process statistics.
 	//! \~russian Статистика процесса.
 	struct PIP_EXPORT ProcessStats: ProcessStatsFixed {
-
 		//! \~english Fill human-readable fields
 		//! \~russian Заполнить читаемые поля
 		void makeStrings();
@@ -191,12 +189,11 @@ public:
 		PIString data_memsize_readable;
 	};
 
-	//! \ingroup System
+	//! \ingroup Application
 	//! \~\brief
 	//! \~english Thread statistics.
 	//! \~russian Статистика потока.
 	struct PIP_EXPORT ThreadStats: ThreadStatsFixed {
-
 		//! \~english Name
 		//! \~russian Имя
 		PIString name;
@@ -206,12 +203,12 @@ public:
 
 	//! \~english Starts monitoring of process with PID "pID" and update interval "interval_ms" milliseconds
 	//! \~russian Начинает мониторинг процесса с PID "pID" и интервалом обновления "interval_ms" миллисекунд
-	bool startOnProcess(int pID, int interval_ms = 1000);
+	bool startOnProcess(int pID, PISystemTime interval = PISystemTime::fromSeconds(1.));
 #endif
 
 	//! \~english Starts monitoring of application process with update interval "interval_ms" milliseconds
 	//! \~russian Начинает мониторинг процесса приложения с интервалом обновления "interval_ms" миллисекунд
-	bool startOnSelf(int interval_ms = 1000);
+	bool startOnSelf(PISystemTime interval = PISystemTime::fromSeconds(1.));
 
 	//! \~english Stop monitoring
 	//! \~russian Останавливает мониторинг
@@ -247,7 +244,7 @@ public:
 
 
 private:
-	void run();
+	void run() override;
 	void gatherThread(llong id);
 	float calcThreadUsage(PISystemTime & t_new, PISystemTime & t_old);
 
@@ -263,52 +260,64 @@ private:
 
 	class PIP_EXPORT Pool {
 		friend class PISystemMonitor;
+
 	public:
 		static Pool * instance();
 		PISystemMonitor * getByPID(int pID);
+
 	private:
 		void add(PISystemMonitor * sm);
 		void remove(PISystemMonitor * sm);
 		PIMap<int, PISystemMonitor *> sysmons;
 		PIMutex mutex;
 	};
-
-
 };
 
 //! \relatesalso PICout
 //! \~english Output operator to \a PICout
 //! \~russian Оператор вывода в \a PICout
 inline PICout operator<<(PICout s, const PISystemMonitor::ThreadStats & v) {
-	s.setControl(0, true);
+	s.saveAndSetControls(0);
-	s << "ThreadInfo(\"" << v.name << "\", created " << v.created
+	s << "ThreadInfo(\"" << v.name << "\", created " << v.created << ", work " << v.work_time.toMilliseconds() << " ms"
-	  << ", work " << v.work_time.toMilliseconds() << " ms"
 	  << ", kernel " << v.kernel_time.toMilliseconds() << " ms"
 	  << ", user " << v.user_time.toMilliseconds() << " ms"
 	  << ")\n";
-	s.restoreControl();
+	s.restoreControls();
 	return s;
 }
 
 
-//! \relatesalso PIByteArray
+//! \relatesalso PIBinaryStream
-//! \~english Store operator
+//! \~english Store operator.
-//! \~russian Оператор сохранения
+//! \~russian Оператор сохранения.
-PIP_EXPORT PIByteArray & operator <<(PIByteArray & s, const PISystemMonitor::ProcessStats & v);
+BINARY_STREAM_WRITE(PISystemMonitor::ProcessStats) {
+	s << PIMemoryBlock(&v, sizeof(PISystemMonitor::ProcessStatsFixed)) << v.exec_name << v.state;
+	return s;
+}
 
-//! \relatesalso PIByteArray
+//! \relatesalso PIBinaryStream
-//! \~english Restore operator
+//! \~english Restore operator.
-//! \~russian Оператор извлечения
+//! \~russian Оператор извлечения.
-PIP_EXPORT PIByteArray & operator >>(PIByteArray & s,       PISystemMonitor::ProcessStats & v);
+BINARY_STREAM_READ(PISystemMonitor::ProcessStats) {
+	s >> PIMemoryBlock(&v, sizeof(PISystemMonitor::ProcessStatsFixed)) >> v.exec_name >> v.state;
+	v.makeStrings();
+	return s;
+}
 
-//! \relatesalso PIByteArray
+//! \relatesalso PIBinaryStream
-//! \~english Store operator
+//! \~english Store operator.
-//! \~russian Оператор сохранения
+//! \~russian Оператор сохранения.
-PIP_EXPORT PIByteArray & operator <<(PIByteArray & s, const PISystemMonitor::ThreadStats & v);
+BINARY_STREAM_WRITE(PISystemMonitor::ThreadStats) {
+	s << PIMemoryBlock(&v, sizeof(PISystemMonitor::ThreadStatsFixed)) << v.name;
+	return s;
+}
 
-//! \relatesalso PIByteArray
+//! \relatesalso PIBinaryStream
-//! \~english Restore operator
+//! \~english Restore operator.
-//! \~russian Оператор извлечения
+//! \~russian Оператор извлечения.
-PIP_EXPORT PIByteArray & operator >>(PIByteArray & s,       PISystemMonitor::ThreadStats & v);
+BINARY_STREAM_READ(PISystemMonitor::ThreadStats) {
+	s >> PIMemoryBlock(&v, sizeof(PISystemMonitor::ThreadStatsFixed)) >> v.name;
+	return s;
+}
 
 #endif // PISYSTEMMONITOR_H

libs/main/client_server/piclientserver_client.h

@@ -0,0 +1,69 @@
+/*! \file piclientserver_client.h
+ * \ingroup ClientServer
+ * \~\brief
+ * \~english
+ * \~russian
+ */
+/*
+    PIP - Platform Independent Primitives
+	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/>.
+*/
+
+#ifndef piclientserver_client_H
+#define piclientserver_client_H
+
+#include "piclientserver_client_base.h"
+
+
+namespace PIClientServer {
+
+
+// ServerClient
+
+class PIP_CLIENT_SERVER_EXPORT ServerClient: public ClientBase {
+	friend class Server;
+	NO_COPY_CLASS(ServerClient);
+
+public:
+	ServerClient() {}
+
+protected:
+	virtual void aboutDelete() {}
+
+private:
+	void createForServer(Server * parent, PIEthernet * tcp_);
+};
+
+
+// Client
+
+class PIP_CLIENT_SERVER_EXPORT Client: public ClientBase {
+	NO_COPY_CLASS(Client);
+
+public:
+	Client();
+	~Client();
+
+	void connect(PINetworkAddress addr);
+
+protected:
+
+private:
+};
+
+} // namespace PIClientServer
+
+#endif

libs/main/client_server/piclientserver_client_base.h

@@ -0,0 +1,86 @@
+/*! \file piclientserver_client_base.h
+ * \ingroup ClientServer
+ * \~\brief
+ * \~english
+ * \~russian
+ */
+/*
+    PIP - Platform Independent Primitives
+	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/>.
+*/
+
+#ifndef piclientserver_client_base_H
+#define piclientserver_client_base_H
+
+#include "piclientserver_config.h"
+#include "pidiagnostics.h"
+#include "pip_client_server_export.h"
+#include "pistreampacker.h"
+
+class PIEthernet;
+
+namespace PIClientServer {
+
+class Server;
+
+class PIP_CLIENT_SERVER_EXPORT ClientBase {
+	friend class Config;
+	friend class Server;
+	NO_COPY_CLASS(ClientBase);
+
+public:
+	ClientBase();
+	virtual ~ClientBase();
+
+	const PIEthernet * getTCP() const { return tcp; }
+
+	void close();
+	void stopAndWait();
+
+	int write(const void * d, const size_t s);
+	int write(const PIByteArray & ba) { return write(ba.data(), ba.size()); }
+
+	void enableDiagnostics();
+	PIDiagnostics::State diagnostics() const;
+	int receivePacketProgress() const;
+
+	Config & configuration() { return config; }
+
+protected:
+	virtual void readed(PIByteArray data) {}
+	virtual void connected() {}
+	virtual void disconnected() {}
+	virtual void receivePacketStart(int size) {}
+	virtual void receivePacketEnd() {}
+
+	void init();
+
+	bool own_tcp               = false;
+	std::atomic_bool can_write = {true};
+	PIEthernet * tcp           = nullptr;
+	Config config;
+
+private:
+	void destroy();
+
+	PIStreamPacker stream;
+	mutable PIMutex write_mutex;
+	PIDiagnostics * diag = nullptr;
+};
+
+} // namespace PIClientServer
+
+#endif

libs/main/client_server/piclientserver_config.h

@@ -0,0 +1,60 @@
+/*! \file piclientserver_config.h
+ * \ingroup ClientServer
+ * \~\brief
+ * \~english
+ * \~russian
+ */
+/*
+    PIP - Platform Independent Primitives
+	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/>.
+*/
+
+#ifndef piclientserver_config_H
+#define piclientserver_config_H
+
+#include "pibytearray.h"
+#include "pip_client_server_export.h"
+
+
+namespace PIClientServer {
+
+class Server;
+class Client;
+class ClientBase;
+
+class PIP_CLIENT_SERVER_EXPORT Config {
+	friend class Server;
+	friend class Client;
+
+public:
+	void setPacketSign(ushort sign);
+	void setPacketSize(int bytes);
+
+	void enableSymmetricEncryption(const PIByteArray & key);
+
+protected:
+	void apply(ClientBase * client);
+
+	PIByteArray crypt_key;
+	ushort packet_sign = 0xAFBE;
+	int packet_size    = 1400;
+
+private:
+};
+
+} // namespace PIClientServer
+
+#endif

libs/main/client_server/piclientserver_server.h

@@ -0,0 +1,82 @@
+/*! \file piclientserver_server.h
+ * \ingroup ClientServer
+ * \~\brief
+ * \~english
+ * \~russian
+ */
+/*
+    PIP - Platform Independent Primitives
+	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/>.
+*/
+
+#ifndef piclientserver_server_H
+#define piclientserver_server_H
+
+#include "piclientserver_config.h"
+#include "pimutex.h"
+#include "pinetworkaddress.h"
+#include "pip_client_server_export.h"
+#include "pithreadnotifier.h"
+
+class PIEthernet;
+class PIThread;
+
+namespace PIClientServer {
+
+class ServerClient;
+
+class PIP_CLIENT_SERVER_EXPORT Server {
+	friend class ServerClient;
+	NO_COPY_CLASS(Server);
+
+public:
+	Server();
+	virtual ~Server();
+
+	void listen(PINetworkAddress addr);
+	void listenAll(ushort port) { listen({0, port}); }
+
+	void closeAll();
+
+	int getMaxClients() const { return max_clients; }
+	void setMaxClients(int new_max_clients);
+	int clientsCount() const;
+	void forEachClient(std::function<void(ServerClient *)> func);
+
+	void setClientFactory(std::function<ServerClient *()> f) { client_factory = f; }
+
+	Config & configuration() { return config; }
+
+private:
+	void stopServer();
+	void newClient(ServerClient * c);
+	void clientDisconnected(ServerClient * c);
+
+	std::function<ServerClient *()> client_factory;
+	std::atomic_bool is_closing = {false};
+	PIEthernet * tcp_server     = nullptr;
+	PIThread * clean_thread     = nullptr;
+	PIThreadNotifier clean_notifier;
+	Config config;
+	PIVector<ServerClient *> clients;
+	mutable PIMutex clients_mutex;
+
+	int max_clients = 1000;
+};
+
+} // namespace PIClientServer
+
+#endif

libs/main/cloud/picloudbase.h

@@ -31,8 +31,7 @@
 #include "pistreampacker.h"
 
 
-class PIP_CLOUD_EXPORT PICloudBase
+class PIP_CLOUD_EXPORT PICloudBase {
-{
 public:
 	PICloudBase();
 

libs/main/cloud/picloudclient.h

@@ -32,9 +32,11 @@
 
 //! \brief PICloudClient
 
-class PIP_CLOUD_EXPORT PICloudClient: public PIIODevice, public PICloudBase
+class PIP_CLOUD_EXPORT PICloudClient
-{
+	: public PIIODevice
-	PIIODEVICE(PICloudClient, "")
+	, public PICloudBase {
+	PIIODEVICE(PICloudClient, "");
+
 public:
 	explicit PICloudClient(const PIString & path = PIString(), PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
 	virtual ~PICloudClient();
@@ -42,16 +44,18 @@ 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(connected);
-	EVENT(disconnected)
+	EVENT(disconnected);
 
 protected:
-	bool openDevice();
+	bool openDevice() override;
-	bool closeDevice();
+	bool closeDevice() override;
-	int readDevice(void * read_to, int max_size);
+	ssize_t readDevice(void * read_to, ssize_t max_size) override;
-	int writeDevice(const void * data, int size);
+	ssize_t writeDevice(const void * data, ssize_t size) override;
-	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Reliable;}
+	DeviceInfoFlags deviceInfoFlags() const override { return PIIODevice::Reliable; }
 
 private:
 	EVENT_HANDLER1(void, _readed, PIByteArray &, data);

libs/main/cloud/picloudmodule.h

@@ -51,8 +51,8 @@
 #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

@@ -30,26 +30,32 @@
 #include "piconditionvar.h"
 
 
-class PIP_CLOUD_EXPORT PICloudServer: public PIIODevice, public PICloudBase
+class PIP_CLOUD_EXPORT PICloudServer
-{
+	: public PIIODevice
-	PIIODEVICE(PICloudServer, "")
+	, 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 openDevice() override;
-		bool closeDevice();
+		bool closeDevice() override;
-		int readDevice(void * read_to, int max_size);
+		ssize_t readDevice(void * read_to, ssize_t max_size) override;
-		int writeDevice(const void * data, int size);
+		ssize_t writeDevice(const void * data, ssize_t size) override;
-		DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Reliable;}
+		DeviceInfoFlags deviceInfoFlags() const override { return PIIODevice::Reliable; }
+		ssize_t bytesAvailable() const override { return buff.size(); }
+		void interrupt() override;
 
 	private:
 		void pushBuffer(const PIByteArray & ba);
@@ -65,13 +71,14 @@ public:
 
 	PIVector<PICloudServer::Client *> clients() const;
 
-	EVENT1(newConnection, PICloudServer::Client * , client)
+	EVENT1(newConnection, PICloudServer::Client *, client);
 
 protected:
-	bool openDevice();
+	bool openDevice() override;
-	bool closeDevice();
+	bool closeDevice() override;
-	int readDevice(void * read_to, int max_size);
+	ssize_t readDevice(void * read_to, ssize_t max_size) override;
-	int writeDevice(const void * data, int max_size);
+	ssize_t writeDevice(const void * data, ssize_t max_size) override;
+	void interrupt() override;
 
 private:
 	EVENT_HANDLER1(void, _readed, PIByteArray &, ba);
@@ -80,9 +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;
+	PIThread ping_timer;
+	PIConditionVariable cvar;
+	PIMutex open_mutex;
 	mutable PIMutex clients_mutex;
+	std::atomic_bool is_deleted;
 };
 
 #endif // PICLOUDSERVER_H

libs/main/cloud/picloudtcp.h

@@ -26,9 +26,9 @@
 #ifndef PICLOUDTCP_H
 #define PICLOUDTCP_H
 
+#include "pimutex.h"
 #include "pip_cloud_export.h"
 #include "pistring.h"
-#include "pimutex.h"
 
 
 class PIEthernet;
@@ -37,7 +37,6 @@ class PIStreamPacker;
 namespace PICloud {
 
 
-
 class PIP_CLOUD_EXPORT TCP {
 public:
 	enum Version {
@@ -91,9 +90,8 @@ private:
 	PIString server_name;
 	PIStreamPacker * streampacker;
 	PIMutex mutex_send;
-
 };
 
-}
+} // namespace PICloud
 
 #endif // PICLOUDTCP_H

libs/main/code/picodeinfo.cpp

@@ -18,45 +18,68 @@
 */
 
 #include "picodeinfo.h"
+
 #include "pivariant.h"
 
 
 PIString PICodeInfo::EnumInfo::memberName(int value_) const {
 	piForeachC(PICodeInfo::EnumeratorInfo & e, members)
-		if (e.value == value_)
+		if (e.value == value_) return e.name.toString();
-			return e.name.toString();
 	return PIString();
 }
 
 
 int PICodeInfo::EnumInfo::memberValue(const PIString & name_) const {
 	piForeachC(PICodeInfo::EnumeratorInfo & e, members)
-		if (e.name.toString() == name_)
+		if (e.name.toString() == name_) return e.value;
-			return e.value;
 	return -1;
 }
 
 
 PIVariantTypes::Enum PICodeInfo::EnumInfo::toPIVariantEnum() {
 	PIVariantTypes::Enum en(name.toString());
-	for (auto m: members) en << m.toPIVariantEnumerator();
+	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();
+	if (!p || !class_name || !member_name) return PIVariant();
-	AccessTypeFunction atf = accessTypeFunctions->value(class_name, (AccessTypeFunction)0);
+	AccessTypeFunction atf  = PICODEINFO::accessTypeFunctions().value(class_name, (AccessTypeFunction) nullptr);
-	AccessValueFunction avf = accessValueFunctions->value(class_name, (AccessValueFunction)0);
+	AccessValueFunction avf = PICODEINFO::accessValueFunctions().value(class_name, (AccessValueFunction) nullptr);
 	if (!atf || !avf) return PIVariant();
 	return PIVariant::fromValue(avf(p, member_name), PIStringAscii(atf(member_name)));
 }
+
+
+PICodeInfo::__Storage__::__Storage__() {
+	classesInfo          = new PIMap<PIConstChars, ClassInfo *>;
+	enumsInfo            = new PIMap<PIConstChars, EnumInfo *>;
+	accessValueFunctions = new PIMap<PIConstChars, AccessValueFunction>;
+	accessTypeFunctions  = new PIMap<PIConstChars, AccessTypeFunction>;
+	(*enumsInfo)[""]     = new EnumInfo();
+}
+
+
+PICodeInfo::__Storage__::~__Storage__() {
+	piDeleteAll(classesInfo->values());
+	piDeleteAll(enumsInfo->values());
+	piDeleteSafety(classesInfo);
+	piDeleteSafety(enumsInfo);
+	piDeleteSafety(accessValueFunctions);
+	piDeleteSafety(accessTypeFunctions);
+}
+
+
+PICodeInfo::__Storage__ * PICodeInfo::__Storage__::instance() {
+	static __Storage__ ret;
+	return &ret;
+}
+
+
+PICodeInfo::ClassInfoInterface classesInfo;
+PICodeInfo::EnumsInfoInterface enumsInfo;
+PICodeInfo::AccessValueFunctionInterface accessValueFunctions;
+PICodeInfo::AccessTypeFunctionInterface accessTypeFunctions;

libs/main/code/picodeinfo.h

@@ -1,8 +1,8 @@
 /*! \file picodeinfo.h
  * \ingroup Code
  * \~\brief
- * \~english C++ code info structs
+ * \~english C++ code info structs. See \ref code_model.
- * \~russian Структуры для C++ кода
+ * \~russian Структуры для C++ кода. Подробнее \ref code_model.
  */
 /*
     PIP - Platform Independent Primitives
@@ -34,17 +34,24 @@
 
 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,
+	Const /** const    */    = 0x01,
-	Static = 0x02,
+	Static /** static   */   = 0x02,
-	Mutable = 0x04,
+	Mutable /** mutable  */  = 0x04,
-	Volatile = 0x08,
+	Volatile /** volatile */ = 0x08,
-	Inline = 0x10,
+	Inline /** inline   */   = 0x10,
-	Virtual = 0x20,
+	Virtual /** virtual  */  = 0x20,
-	Extern = 0x40
+	Extern /** extern   */   = 0x40
 };
 
 typedef PIFlags<PICodeInfo::TypeFlag> TypeFlags;
@@ -52,49 +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 PIConstChars & n = PIConstChars(), const PIConstChars & t = PIConstChars(), 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;
+
+	//! \~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;
+
+	//! \~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;
+
+	//! \~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 PIConstChars & n = PIConstChars(), 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;
+
+	//! \~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;
+
+	//! \~english Name
+	//! \~russian Имя
 	PIConstChars name;
+
+	//! \~english Members
+	//! \~russian Элементы
 	PIVector<PICodeInfo::EnumeratorInfo> members;
 };
 
@@ -107,22 +216,26 @@ 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())
+	if (!v.name.isEmpty()) s << " " << v.name;
-		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;
 		for (const auto & i: v.parents) {
-			if (first) first = false;
+			if (first)
-			else s << ", ";
+				first = false;
+			else
+				s << ", ";
 			s << i;
 		}
 	}
@@ -131,51 +244,132 @@ inline PICout operator <<(PICout s, const PICodeInfo::ClassInfo & v) {
 		s << PICoutManipulators::Tab << i.return_type << " " << i.name << "(";
 		bool fa = true;
 		for (const auto & a: i.arguments) {
-			if (fa) fa = false;
+			if (fa)
-			else s << ", ";
+				fa = false;
+			else
+				s << ", ";
 			s << a;
 		}
 		s << ") Meta" << i.meta << ";\n";
 	}
-	if (!v.functions.isEmpty() && !v.variables.isEmpty())
+	if (!v.functions.isEmpty() && !v.variables.isEmpty()) s << "\n";
-		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";
 	for (const auto & i: v.members) {
 		bool f = true;
-		if (f) f = false;
+		if (f)
-		else s << ", ";
+			f = false;
+		else
+			s << ", ";
 		s << PICoutManipulators::Tab << i << "\n";
 	}
 	s << "}\n";
-	s.restoreControl();
+	s.restoreControls();
 	return s;
 }
 
-extern PIP_EXPORT PIMap<PIConstChars, PICodeInfo::ClassInfo * > * classesInfo;
+
-extern PIP_EXPORT PIMap<PIConstChars, PICodeInfo::EnumInfo * > * enumsInfo;
+class PIP_EXPORT __Storage__ {
-extern PIP_EXPORT PIMap<PIConstChars, PICodeInfo::AccessValueFunction> * accessValueFunctions;
+	__Storage__();
-extern PIP_EXPORT PIMap<PIConstChars, PICodeInfo::AccessTypeFunction> * accessTypeFunctions;
+	~__Storage__();
+
+public:
+	static __Storage__ * instance();
+
+	PIMap<PIConstChars, PICodeInfo::ClassInfo *> * classesInfo;
+	PIMap<PIConstChars, PICodeInfo::EnumInfo *> * enumsInfo;
+	PIMap<PIConstChars, PICodeInfo::AccessValueFunction> * accessValueFunctions;
+	PIMap<PIConstChars, PICodeInfo::AccessTypeFunction> * accessTypeFunctions;
+
+private:
+	NO_COPY_CLASS(__Storage__)
+};
+
+class PIP_EXPORT __StorageAccess__ {
+public:
+	//! \~english Getter for single storage of PICodeInfo::ClassInfo, access by name
+	//! \~russian Доступ к единому хранилищу PICodeInfo::ClassInfo, доступ по имени
+	static const PIMap<PIConstChars, PICodeInfo::ClassInfo *> & classes() { return *(__Storage__::instance()->classesInfo); }
+
+	//! \~english Getter for single storage of PICodeInfo::EnumInfo, access by name
+	//! \~russian Доступ к единому хранилищу хранилище PICodeInfo::EnumInfo, доступ по имени
+	static const PIMap<PIConstChars, PICodeInfo::EnumInfo *> & enums() { return *(__Storage__::instance()->enumsInfo); }
+
+	static const PIMap<PIConstChars, PICodeInfo::AccessValueFunction> & accessValueFunctions() {
+		return *(__Storage__::instance()->accessValueFunctions);
+	}
+
+	static const PIMap<PIConstChars, PICodeInfo::AccessTypeFunction> & accessTypeFunctions() {
+		return *(__Storage__::instance()->accessTypeFunctions);
+	}
+};
+
+#define PICODEINFO PICodeInfo::__StorageAccess__
+
+
+class PIP_EXPORT ClassInfoInterface {
+public:
+	const PIMap<PIConstChars, PICodeInfo::ClassInfo *> * operator->() const DEPRECATEDM("use PICODEINFO::classes()") {
+		return __Storage__::instance()->classesInfo;
+	}
+};
+static ClassInfoInterface classesInfo;
+
+
+class PIP_EXPORT EnumsInfoInterface {
+public:
+	const PIMap<PIConstChars, PICodeInfo::EnumInfo *> * operator->() const DEPRECATEDM("use PICODEINFO::enums()") {
+		return __Storage__::instance()->enumsInfo;
+	}
+};
+static EnumsInfoInterface enumsInfo;
+
+
+class PIP_EXPORT AccessValueFunctionInterface {
+public:
+	const PIMap<PIConstChars, PICodeInfo::AccessValueFunction> * operator->() const DEPRECATEDM("use PICODEINFO::accessValueFunctions()") {
+		return __Storage__::instance()->accessValueFunctions;
+	}
+};
+static AccessValueFunctionInterface accessValueFunctions;
+
+
+class PIP_EXPORT AccessTypeFunctionInterface {
+public:
+	const PIMap<PIConstChars, PICodeInfo::AccessTypeFunction> * operator->() const DEPRECATEDM("use PICODEINFO::accessTypeFunctions()") {
+		return __Storage__::instance()->accessTypeFunctions;
+	}
+};
+static AccessTypeFunctionInterface accessTypeFunctions;
+
+
+STATIC_INITIALIZER_BEGIN
+	NO_UNUSED(classesInfo);
+	NO_UNUSED(enumsInfo);
+	NO_UNUSED(accessValueFunctions);
+	NO_UNUSED(accessTypeFunctions);
+STATIC_INITIALIZER_END
+
 
 inline PIByteArray getMemberValue(const void * p, const char * class_name, const char * member_name) {
-	if (!p || !class_name || !member_name || !accessValueFunctions) return PIByteArray();
+	if (!p || !class_name || !member_name) return PIByteArray();
-	AccessValueFunction af = accessValueFunctions->value(class_name, (AccessValueFunction)0);
+	AccessValueFunction af = PICODEINFO::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 "";
+	if (!class_name || !member_name) return "";
-	AccessTypeFunction af = accessTypeFunctions->value(class_name, (AccessTypeFunction)0);
+	AccessTypeFunction af = PICODEINFO::accessTypeFunctions().value(class_name, (AccessTypeFunction)0);
 	if (!af) return "";
 	return af(member_name);
 }
@@ -184,26 +378,14 @@ 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<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_;
-};
-
-static __PICodeInfoInitializer__ __picodeinfoinitializer__;
 
 #endif // PICODEINFO_H

libs/main/code/picodemodule.h

@@ -35,9 +35,11 @@
 //!
 //! \~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

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")
+		piCout << ("Error: in expansion of macro \"" + name + '(' + args.join(", ") + ")\": expect") << args.size() << "arguments but takes"
-			   << args.size() << "arguments but takes" << arg_vals.size() << "!";
+			   << arg_vals.size() << "!";
 		if (ok != 0) *ok = false;
 		return PIString();
 	}
@@ -72,7 +74,6 @@ PIString PICodeParser::Macro::expand(PIString args_, bool * ok) const {
 }
 
 
-
 PICodeParser::PICodeParser() {
 	macros_iter   = 32;
 	with_includes = true;
@@ -138,10 +139,14 @@ void PICodeParser::parseFiles(const PIStringList & files, bool follow_includes)
 }
 
 
+void PICodeParser::parseFileContent(PIString fc) {
+	parseFileContent(fc, false);
+}
+
+
 bool PICodeParser::isEnum(const PIString & name) {
 	piForeachC(Enum & e, enums)
-		if (e.name == name)
+		if (e.name == name) return true;
-			return true;
 	return false;
 }
 
@@ -174,7 +179,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();
@@ -192,32 +198,137 @@ void PICodeParser::clear() {
 	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("PIOBJECT_SUBCLASS"),
+	                "",
+	                PIStringList() << "name"
+	                               << "parent")
 		   << Macro(PIStringAscii("PIIODEVICE"), "", PIStringList() << "name")
-		   << Macro(PIStringAscii("NO_COPY_CLASS"), "", PIStringList() << "name")
+		   << Macro(PIStringAscii("NO_COPY_CLASS"), "", PIStringList() << "name") << Macro(PIStringAscii("PRIVATE_DECLARATION"))
-		   << 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("EVENT1"),
-		   << Macro(PIStringAscii("EVENT2"), "void name(a0 n0, a1 n1);", PIStringList() << "name" << "a0" << "n0" << "a1" << "n1")
+	                "void name(a0 n0);",
-		   << Macro(PIStringAscii("EVENT3"), "void name(a0 n0, a1 n1, a2 n2);", PIStringList() << "name" << "a0" << "n0" << "a1" << "n1" << "a2" << "n2")
+	                PIStringList() << "name"
-		   << Macro(PIStringAscii("EVENT4"), "void name(a0 n0, a1 n1, a2 n2, a3 n3);", PIStringList() << "name" << "a0" << "n0" << "a1" << "n1" << "a2" << "n2" << "a3" << "n3")
+	                               << "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_HANDLER"),
-		   << Macro(PIStringAscii("EVENT_HANDLER0"), "ret name()", PIStringList() << "ret" << "name")
+	                "ret name()",
-		   << Macro(PIStringAscii("EVENT_HANDLER1"), "ret name(a0 n0)", PIStringList() << "ret" << "name" << "a0" << "n0")
+	                PIStringList() << "ret"
-		   << Macro(PIStringAscii("EVENT_HANDLER2"), "ret name(a0 n0, a1 n1)", PIStringList() << "ret" << "name" << "a0" << "n0" << "a1" << "n1")
+	                               << "name")
-		   << Macro(PIStringAscii("EVENT_HANDLER3"), "ret name(a0 n0, a1 n1, a2 n2)", PIStringList() << "ret" << "name" << "a0" << "n0" << "a1" << "n1" << "a2" << "n2")
+		   << Macro(PIStringAscii("EVENT_HANDLER0"),
-		   << 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")
+	                "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_VHANDLER"),
-		   << Macro(PIStringAscii("EVENT_VHANDLER0"), "virtual ret name()", PIStringList() << "ret" << "name")
+	                "virtual ret name()",
-		   << Macro(PIStringAscii("EVENT_VHANDLER1"), "virtual ret name(a0 n0)", PIStringList() << "ret" << "name" << "a0" << "n0")
+	                PIStringList() << "ret"
-		   << Macro(PIStringAscii("EVENT_VHANDLER2"), "virtual ret name(a0 n0, a1 n1)", PIStringList() << "ret" << "name" << "a0" << "n0" << "a1" << "n1")
+	                               << "name")
-		   << 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_VHANDLER0"),
-		   << 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")
+	                "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");
 }
 
 
@@ -247,7 +358,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;
 		}
@@ -258,9 +370,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) == "/*") {
-		if (fc.mid(i, 2) == "*/" && mlc) {mlc = false; fc.cutMid(mls, i - mls + 2); i = mls - 1; continue;}
+			mlc = true;
-		if (fc.mid(i, 2) == "//" && !mlc) {ole = fc.find('\n', i); fc.cutMid(i, ole < 0 ? -1 : ole - i); --i; continue;}
+			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);
 
@@ -295,7 +422,8 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 				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;
@@ -311,6 +439,7 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 
 	// piCout << PICoutManipulators::NewLine << "file" << cur_file << pfc;
 	int pl      = -1;
+	cur_def_vis = Global;
 	while (!pfc.isEmpty()) {
 		pfc.trim();
 		int nl = pfc.size_s();
@@ -321,6 +450,7 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 			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;
@@ -330,14 +460,25 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 			pfc.takeRange('<', '>');
 			bool def = !isDeclaration(pfc, 0, &end);
 			pfc.cutLeft(end);
-			if (def) pfc.takeRange('{', '}');
+			if (def)
-			else pfc.takeSymbol();
+				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;}
+			// piCout << pfc.left(6) << dind << find;
-			if (dind < 0 || find < dind) {pfc.cutLeft(6); continue;}
+			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, false);
@@ -348,6 +489,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;
@@ -355,8 +502,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();
+			if (typedefs.back().first.isEmpty())
-			else root_.typedefs << typedefs.back();
+				typedefs.pop_back();
+			else
+				root_.typedefs << typedefs.back();
 			pfc.takeSymbol();
 			continue;
 		}
@@ -398,27 +547,33 @@ 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);
+			if (p.contains(' '))
-			else pn = p;
+				pn = p.mid(p.find(' ') + 1);
+			else
+				pn = p;
 			pe = findEntityByName(pn);
-			if (pe == 0) ;//{piCout << "Error: can`t find" << pn;}
+			if (pe == 0)
-			else parents << pe;
+				; //{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;
@@ -441,10 +596,6 @@ void PICodeParser::parseClass(Entity * parent, PIString & fc, bool is_namespace)
 	Visibility prev_vis               = cur_def_vis;
 	int dind = fc.find('{'), find = fc.find(';'), end = 0;
 	if (dind < 0 && find < 0) return;
-	if (dind < 0 || find < dind) {
-		fc.left(find);
-		return;
-	}
 	// piCout << "parse class <****\n" << fc << "\n****>";
 	Entity * ce = parent;
 	if (!is_namespace) {
@@ -452,7 +603,6 @@ void PICodeParser::parseClass(Entity * parent, PIString & fc, bool is_namespace)
 		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;
@@ -466,9 +616,21 @@ void PICodeParser::parseClass(Entity * parent, PIString & fc, bool is_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_public) {
-		if (cw == s_protected) {cur_def_vis = Protected; fc.cutLeft(1); continue;}
+			cur_def_vis = Public;
-		if (cw == s_private  ) {cur_def_vis = Private;   fc.cutLeft(1); continue;}
+			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;
@@ -478,6 +640,7 @@ void PICodeParser::parseClass(Entity * parent, PIString & fc, bool is_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();
@@ -494,18 +657,26 @@ void PICodeParser::parseClass(Entity * parent, PIString & fc, bool is_namespace)
 			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())
+				if (ce->typedefs.back().first.isEmpty()) ce->typedefs.pop_back();
-					ce->typedefs.pop_back();
 			}
 			fc.takeSymbol();
 			continue;
@@ -514,17 +685,22 @@ void PICodeParser::parseClass(Entity * parent, PIString & fc, bool is_namespace)
 			fc.takeRange('<', '>');
 			def = !isDeclaration(fc, 0, &end);
 			fc.cutLeft(end);
-			if (def) fc.takeRange('{', '}');
+			if (def)
-			else fc.takeSymbol();
+				fc.takeRange('{', '}');
+			else
+				fc.takeSymbol();
 			continue;
 		}
 		def = !isDeclaration(fc, 0, &end);
 		tmp = (cw + fc.takeLeft(end)).trim();
-		if (!tmp.isEmpty() && ce)
+		if (!tmp.isEmpty() && ce) parseMember(ce, tmp);
-			parseMember(ce, tmp);
+		if (def)
-		if (def) fc.takeRange('{', '}');
+			fc.takeRange('{', '}');
-		else fc.takeSymbol();
+		else
-		if (ps == fc.size_s()) {fc.cutLeft(1);}
+			fc.takeSymbol();
+		if (ps == fc.size_s()) {
+			fc.cutLeft(1);
+		}
 		ps = fc.size_s();
 	}
 	cur_def_vis   = prev_vis;
@@ -568,14 +744,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('=');
+		vn  = v;
-		if (ind > 0) {cv = v.right(v.size_s() - ind - 1).toInt(); vn = v.left(ind);}
+		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())
+		if (e.members.back().name.isEmpty()) e.members.pop_back();
-			e.members.pop_back();
 	enums << e;
 	return true;
 }
@@ -589,7 +768,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();
@@ -636,7 +818,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 + '>';
@@ -682,8 +868,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)
+			if ((i = a.find('=')) > 0) a.cutRight(a.size_s() - i).trim();
-				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);
@@ -692,8 +877,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('['))
+			if (a.contains('[')) crepl = a.takeMid(a.find('['), a.findLast(']') - a.find('[') + 1);
-				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);
@@ -723,8 +907,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;}
+			if (vn) {
-			else {if (_isCChar(ctemp[ts]) || ctemp[ts].isDigit()) break;}
+				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;
@@ -762,13 +949,13 @@ bool PICodeParser::parseMember(Entity * parent, PIString & fc) {
 			me.type = type;
 			restoreTmpMeta(&me);
 			if (me.name.isEmpty()) continue;
-			if (me.name.contains('['))
+			if (me.name.contains('[')) crepl = me.name.takeMid(me.name.find('['), me.name.findLast(']') - me.name.find('[') + 1);
-				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;
@@ -815,10 +1002,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_const_s) >= 0) {
-	if (n.find(s_s_static_s) >= 0) {n.replaceAll(s_s_static_s, ""); pref += s_static_s;}
+		n.replaceAll(s_s_const_s, "");
-	if (n.find(s_s_mutable_s) >= 0) {n.replaceAll(s_s_mutable_s, ""); pref += s_mutable_s;}
+		pref += s_const_s;
-	if (n.find(s_s_volatile_s) >= 0) {n.replaceAll(s_s_volatile_s, ""); pref += s_volatile_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) {
@@ -918,10 +1117,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 == '!') {
-		if (cc == '(') {br = true; brv = procMacrosCond(fc.takeRange('(', ')'));}
+			neg = true;
-		if (cc == '&' && nc == '&') {fc.remove(0, 2); oper = 1; continue;}
+			fc.pop_front();
-		if (cc == '|' && nc == '|') {fc.remove(0, 2); oper = 2; continue;}
+			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();
@@ -949,8 +1163,7 @@ double PICodeParser::procMacrosCond(PIString fc) {
 
 bool PICodeParser::isDefineExists(const PIString & dn) {
 	piForeachC(Define & d, defines) {
-		if (d.first == dn)
+		if (d.first == dn) return true;
-			return true;
 	}
 	return false;
 }
@@ -958,8 +1171,7 @@ bool PICodeParser::isDefineExists(const PIString & dn) {
 
 double PICodeParser::defineValue(const PIString & dn) {
 	piForeachC(Define & d, defines) {
-		if (d.first == dn)
+		if (d.first == dn) return d.second.isEmpty() ? 1. : d.second.toDouble();
-			return d.second.isEmpty() ? 1. : d.second.toDouble();
 	}
 	return dn.toDouble();
 }
@@ -987,8 +1199,7 @@ void PICodeParser::replaceMeta(PIString & dn) {
 
 PICodeParser::Entity * PICodeParser::findEntityByName(const PIString & en) {
 	piForeach(Entity * e, entities)
-			if (e->name == en)
+		if (e->name == en) return e;
-			return e;
 	return 0;
 }
 
@@ -996,8 +1207,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 < 0) {
-	if (dind < 0 || find < dind) {if (end) *end = find; return true;}
+		if (end) *end = -1;
+		return true;
+	}
+	if (dind < 0 || find < dind) {
+		if (end) *end = find;
+		return true;
+	}
 	if (end) *end = dind;
 	return false;
 }
@@ -1047,10 +1264,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;
 					}
@@ -1059,8 +1277,9 @@ PIString PICodeParser::procMacros(PIString fc) {
 					// piCout << "main elif" << skip << grab << cond_ok;
 					if (cond_ok) {
 						if (grab) {
-							pfc << procMacros(nfc);
+							pfc += procMacros(nfc);
-							skip = true; grab = false;
+							skip = true;
+							grab = false;
 						}
 						continue;
 					}
@@ -1068,26 +1287,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 (grab) pfc += procMacros(nfc);
-					if (skip && !cond_ok) {skip = false; grab = true;}
+					if (skip && !cond_ok) {
-					else {skip = true; grab = false;}
+						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;
+				if (macroCondition(mif, mifcond.trimmed()))
-				else skip = true;
+					grab = cond_ok = true;
+				else
+					skip = true;
 				ifcnt = 0;
 				nfc.clear();
 			} else {
@@ -1095,8 +1322,10 @@ PIString PICodeParser::procMacros(PIString fc) {
 				// return false; /// WARNING: now skip errors
 			}
 		} else {
-			if (grab) nfc << line << '\n';
+			if (grab)
-			else if (!skip) pfc << line << '\n';
+				nfc += line + '\n';
+			else if (!skip)
+				pfc += line + '\n';
 		}
 	}
 	return pfc;
@@ -1147,7 +1376,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

@@ -26,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 PIChar & c) {
-inline bool _isCChar(const PIString & c) {if (c.isEmpty()) return false; return _isCChar(c[0]);}
+	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,
@@ -110,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()) {
+		Enum(const PIString & n = PIString()) { name = n; }
-			name = n;
-		}
 		MetaMap meta;
 		PIString name;
 		PIVector<EnumeratorInfo> members;
@@ -127,6 +139,7 @@ public:
 
 	void parseFile(const PIString & file, bool follow_includes = true);
 	void parseFiles(const PIStringList & files, bool follow_includes = true);
+	void parseFileContent(PIString fc);
 
 	void includeDirectory(const PIString & dir) { includes << dir; }
 	void addDefine(const PIString & def_name, const PIString & def_value) { custom_defines << Define(def_name, def_value); }
@@ -181,7 +194,6 @@ private:
 	PIString cur_namespace;
 	PIMap<PIString, PIString> tmp_temp;
 	PIMap<PIString, MetaMap> tmp_meta;
-	
 };
 
 #endif // PICODEPARSER_H

libs/main/compress/picompress.h

@@ -58,8 +58,8 @@
 #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 если нет поддержки

libs/main/console/pikbdlistener.cpp

@@ -16,13 +16,15 @@
     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 <wingdi.h>
 #  include <wincon.h>
+#  include <wingdi.h>
 #endif
 
 /** \class PIKbdListener
@@ -119,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[?1000");
-	printf("\e[?1002"); printf(on ? "h" : "l");
+	printf(on ? "h" : "l");
+	printf("\e[?1002");
+	printf(on ? "h" : "l");
 	fflush(0);
 }
 #endif
@@ -144,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);
@@ -163,7 +167,8 @@ PIKbdListener::PIKbdListener(KBFunc slot, void * _d, bool startNow): PIThread()
 
 
 PIKbdListener::~PIKbdListener() {
-	terminate();
+	stop();
+	if (!waitForFinish(100_ms)) terminate();
 	end();
 }
 
@@ -215,7 +220,6 @@ void PIKbdListener::readKeyboard() {
 #ifdef WINDOWS
 	INPUT_RECORD ir;
 	ReadConsoleInput(PRIVATE->hIn, &ir, 1, &(PRIVATE->ret));
-	//piCout << ir.EventType;
 	switch (ir.EventType) {
 	case KEY_EVENT: {
 		KEY_EVENT_RECORD ker = ir.Event.KeyEvent;
@@ -224,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 8:
-			case 33: PRIVATE->ret = 1; ke.key = PageUp; break;
+				PRIVATE->ret = 1;
-			case 34: PRIVATE->ret = 1; ke.key = PageDown; break;
+				ke.key       = Backspace;
-			case 35: PRIVATE->ret = 1; ke.key = End; break;
+				break;
-			case 36: PRIVATE->ret = 1; ke.key = Home; break;
+			case 33:
-			case 37: PRIVATE->ret = 1; ke.key = LeftArrow; break;
+				PRIVATE->ret = 1;
-			case 38: PRIVATE->ret = 1; ke.key = UpArrow; break;
+				ke.key       = PageUp;
-			case 39: PRIVATE->ret = 1; ke.key = RightArrow; break;
+				break;
-			case 40: PRIVATE->ret = 1; ke.key = DownArrow; break;
+			case 34:
-			case 45: PRIVATE->ret = 1; ke.key = Insert; break;
+				PRIVATE->ret = 1;
-			case 46: PRIVATE->ret = 1; ke.key = Delete; break;
+				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 '\n':
-			case ' ':  PRIVATE->ret = 1; ke.key = Space; break;
+				PRIVATE->ret = 1;
-			case '\t': PRIVATE->ret = 1; ke.key = Tab; break;
+				ke.key       = Return;
-			case 112:  PRIVATE->ret = 1; ke.key = F1; break;
+				break;
-			case 113:  PRIVATE->ret = 1; ke.key = F2; break;
+			case ' ':
-			case 114:  PRIVATE->ret = 1; ke.key = F3; break;
+				PRIVATE->ret = 1;
-			case 115:  PRIVATE->ret = 1; ke.key = F4; break;
+				ke.key       = Space;
-			case 116:  PRIVATE->ret = 1; ke.key = F5; break;
+				break;
-			case 117:  PRIVATE->ret = 1; ke.key = F6; break;
+			case '\t':
-			case 118:  PRIVATE->ret = 1; ke.key = F7; break;
+				PRIVATE->ret = 1;
-			case 119:  PRIVATE->ret = 1; ke.key = F8; break;
+				ke.key       = Tab;
-			case 120:  PRIVATE->ret = 1; ke.key = F9; break;
+				break;
-			case 121:  PRIVATE->ret = 1; ke.key = F10; break;
+			case 112:
-			case 122:  PRIVATE->ret = 1; ke.key = F11; break;
+				PRIVATE->ret = 1;
-			case 123:  PRIVATE->ret = 1; ke.key = F12; break;
+				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;
@@ -261,10 +343,15 @@ void PIKbdListener::readKeyboard() {
 				}
 				break;
 			}
-			if (ke.key == 0) {piMSleep(10); return;}
+			if (ke.key == 0) {
-		} else {piMSleep(10); return;}
+				piMSleep(10);
+				return;
 			}
-		break;
+		} else {
+			piMSleep(10);
+			return;
+		}
+	} break;
 	case MOUSE_EVENT: {
 		MOUSE_EVENT_RECORD mer = ir.Event.MouseEvent;
 		GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
@@ -297,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)))
+			if (piCompareBinary(&prev_me, &me, sizeof(me))) break;
-				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;
-		break;
+	default: piMSleep(10); return;
-	default:
-		piMSleep(10);
-		return;
 	}
 #else
 	tcsetattr(0, TCSANOW, &PRIVATE->tterm);
@@ -327,8 +413,14 @@ void PIKbdListener::readKeyboard() {
 	for (int i = 0; i < PRIVATE->ret; ++i)
 	    std::cout << "'" << (char)(rc[i]) << "' " << (int)(uchar)(rc[i]);
 	std::cout << std::endl;*/
-	if (rc[0] == 0) {piMSleep(10); return;}
+	if (rc[0] == 0) {
-	if (PRIVATE->ret < 0 || PRIVATE->ret > 7) {piMSleep(10); return;}
+		piMSleep(10);
+		return;
+	}
+	if (PRIVATE->ret < 0 || PRIVATE->ret > 7) {
+		piMSleep(10);
+		return;
+	}
 	if (PRIVATE->ret == 1) {
 		if (rc[0] == 8)
 			ke.key = Backspace;
@@ -347,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--;
 			}
@@ -396,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;
@@ -406,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--;
 				}
@@ -432,11 +527,9 @@ void PIKbdListener::readKeyboard() {
 		    cout << "'" << (char)(rc[i]) << "' ";
 		cout << endl;*/
 	}
-	if (ke.key == 0 && PRIVATE->ret > 1)
+	if (ke.key == 0 && PRIVATE->ret > 1) ke.key = PIChar::fromSystem(rc).unicode16Code();
-		ke.key = PIChar(rc).unicode16Code();
 #endif
-	if ((rc[0] == '\n' || rc[0] == '\r') && PRIVATE->ret == 1)
+	if ((rc[0] == '\n' || rc[0] == '\r') && PRIVATE->ret == 1) ke.key = Return;
-		ke.key = Return;
 	if (exit_enabled && ke.key == exit_key) {
 		PIKbdListener::exiting = true;
 		return;
@@ -448,6 +541,11 @@ void PIKbdListener::readKeyboard() {
 }
 
 
+void PIKbdListener::stop() {
+	PIThread::stop();
+}
+
+
 void PIKbdListener::end() {
 	// cout << "list end" << endl;
 #ifdef WINDOWS

libs/main/console/pikbdlistener.h

@@ -27,17 +27,20 @@
 #define PIKBDLISTENER_H
 
 #include "pithread.h"
+#include "pitime.h"
 
-#define WAIT_FOR_EXIT while (!PIKbdListener::exiting) piMSleep(PIP_MIN_MSLEEP*5); // TODO: rewrite with condvar
+#define WAIT_FOR_EXIT                 \
+	while (!PIKbdListener::exiting)   \
+		piMSleep(PIP_MIN_MSLEEP * 5); \
+	if (PIKbdListener::instance()) PIKbdListener::instance()->stopAndWait();
 
 
-class PIP_EXPORT PIKbdListener: public PIThread
+class PIP_EXPORT PIKbdListener: public PIThread {
-{
+	PIOBJECT_SUBCLASS(PIKbdListener, PIThread);
-	PIOBJECT_SUBCLASS(PIKbdListener, PIThread)
 	friend class PIConsole;
 	friend class PITerminal;
-public:
 
+public:
 	//! Special keyboard keys
 	enum SpecialKey {
 		Tab /** Tab key */                = 0x09,
@@ -81,7 +84,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;
@@ -110,7 +116,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;
@@ -154,7 +165,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; }
@@ -167,18 +180,23 @@ public:
 
 	void readKeyboard();
 
+	void stop();
+
 	//! Returns if keyboard listening is active (not running!)
 	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(keyPressed, PIKbdListener::KeyEvent, key, void *, data);
-	EVENT2(mouseEvent, PIKbdListener::MouseEvent, mouse, void * , data)
+	EVENT2(mouseEvent, PIKbdListener::MouseEvent, mouse, void *, data);
-	EVENT2(wheelEvent, PIKbdListener::WheelEvent, wheel, void * , data)
+	EVENT2(wheelEvent, PIKbdListener::WheelEvent, wheel, void *, data);
 
 	//! \handlers
 	//! \{
@@ -205,9 +223,9 @@ public:
 	static PIKbdListener * instance() { return _object; }
 
 private:
-	void begin();
+	void begin() override;
-	void run() {readKeyboard();}
+	void run() override { readKeyboard(); }
-	void end();
+	void end() override;
 
 #ifndef WINDOWS
 	struct PIP_EXPORT EscSeq {
@@ -243,17 +261,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;}
+//! \relatesalso PIBinaryStream
-inline PIByteArray & operator <<(PIByteArray & s, const PIKbdListener::MouseEvent & v) {s << v.x << v.y << (int)v.action << v.buttons << v.modifiers; return s;}
+//! \~english Store operator
-inline PIByteArray & operator <<(PIByteArray & s, const PIKbdListener::WheelEvent & v) {s << (*(PIKbdListener::MouseEvent*)&v) << (uchar)v.direction; return s;}
+//! \~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

@@ -27,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
+class PIP_CONSOLE_EXPORT PIScreen
-{
+	: public PIThread
-	PIOBJECT_SUBCLASS(PIScreen, 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);
 
@@ -72,12 +73,12 @@ 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);
 	EVENT_HANDLER0(void, stop) { stop(false); }
 	EVENT_HANDLER1(void, stop, bool, clear);
 
-	EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void * , data)
+	EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void *, data);
-	EVENT2(tileEvent, PIScreenTile * , tile, PIScreenTypes::TileEvent, e)
+	EVENT2(tileEvent, PIScreenTile *, tile, PIScreenTypes::TileEvent, e);
 
 	//! \handlers
 	//! \{
@@ -134,9 +135,9 @@ private:
 		PIVector<PIVector<PIScreenTypes::Cell>> cells, pcells;
 	};
 
-	void begin();
+	void begin() override;
-	void run();
+	void run() override;
-	void end();
+	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);
@@ -145,9 +146,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 tileEventInternal(PIScreenTile * t, PIScreenTypes::TileEvent e) override;
-	void tileRemovedInternal(PIScreenTile * t);
+	void tileRemovedInternal(PIScreenTile * t) override;
-	void tileSetFocusInternal(PIScreenTile * t);
+	void tileSetFocusInternal(PIScreenTile * t) override;
 
 	bool mouse_;
 	SystemConsole console;
@@ -156,7 +157,6 @@ private:
 	PIKbdListener::KBFunc ret_func;
 	PIScreenTile root;
 	PIScreenTile *tile_focus, *tile_dialog;
-
 };
 
 

libs/main/console/piscreenconsole.h

@@ -35,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;
@@ -64,14 +69,12 @@ protected:
 	};
 	PIVector<Variable> variables;
 	PIScreenTypes::Alignment alignment;
-	void sizeHint(int & w, int & h) const;
+	void sizeHint(int & w, int & h) const override;
-	void drawEvent(PIScreenDrawer * d);
+	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

@@ -30,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,
@@ -49,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 drawPixel(int x,
-	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);
+	               int y,
-	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);
+	               const PIChar & c,
-	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);
+	               PIScreenTypes::Color col_char       = PIScreenTypes::Default,
-	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);
+	               PIScreenTypes::Color col_back       = PIScreenTypes::Default,
-	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);
+	               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(' ')); }
@@ -65,7 +102,6 @@ private:
 	PIVector<PIVector<PIScreenTypes::Cell>> & cells;
 	int width, height;
 	PIMap<ArtChar, PIChar> arts_;
-	
 };
 
 

libs/main/console/piscreentile.h

@@ -26,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);
@@ -50,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_; }
@@ -69,7 +77,6 @@ public:
 	bool visible;
 
 protected:
-	
 	//! Returns desired tile size in "w" and "h"
 	virtual void sizeHint(int & w, int & h) const;
 
@@ -103,7 +110,6 @@ protected:
 
 private:
 	int pw, ph;
-	
 };
 
 

libs/main/console/piscreentiles.h

@@ -31,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());
@@ -39,17 +40,19 @@ public:
 	virtual ~TileSimple() {}
 	PIVector<Row> content;
 	PIScreenTypes::Alignment alignment;
+
 protected:
-	void sizeHint(int & w, int & h) const;
+	void sizeHint(int & w, int & h) const override;
-	void drawEvent(PIScreenDrawer * d);
+	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() {}
@@ -60,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 sizeHint(int & w, int & h) const override;
-	void drawEvent(PIScreenDrawer * d);
+	void drawEvent(PIScreenDrawer * d) override;
-	bool mouseEvent(PIKbdListener::MouseEvent me);
+	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,
@@ -92,20 +97,22 @@ public:
 	SelectionMode selection_mode;
 	PISet<int> selected;
 	int lhei, cur, offset;
+
 protected:
-	void sizeHint(int & w, int & h) const;
+	void sizeHint(int & w, int & h) const override;
-	void resizeEvent(int w, int h);
+	void resizeEvent(int w, int h) override;
-	void drawEvent(PIScreenDrawer * d);
+	void drawEvent(PIScreenDrawer * d) override;
-	bool keyEvent(PIKbdListener::KeyEvent key);
+	bool keyEvent(PIKbdListener::KeyEvent key) override;
-	bool mouseEvent(PIKbdListener::MouseEvent me);
+	bool mouseEvent(PIKbdListener::MouseEvent me) override;
-	bool wheelEvent(PIKbdListener::WheelEvent we);
+	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() {}
@@ -114,18 +121,18 @@ public:
 	};
 	PIScreenTypes::CellFormat format;
 	PIString text;
+
 protected:
-	void sizeHint(int & w, int & h) const;
+	void sizeHint(int & w, int & h) const override;
-	void drawEvent(PIScreenDrawer * d);
+	void drawEvent(PIScreenDrawer * d) override;
-	bool keyEvent(PIKbdListener::KeyEvent key);
+	bool keyEvent(PIKbdListener::KeyEvent key) override;
-	bool mouseEvent(PIKbdListener::MouseEvent me);
+	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() {}
@@ -136,11 +143,12 @@ public:
 	PIScreenTypes::Alignment alignment;
 	PIVector<Button> content;
 	int cur;
+
 protected:
-	void sizeHint(int & w, int & h) const;
+	void sizeHint(int & w, int & h) const override;
-	void drawEvent(PIScreenDrawer * d);
+	void drawEvent(PIScreenDrawer * d) override;
-	bool keyEvent(PIKbdListener::KeyEvent key);
+	bool keyEvent(PIKbdListener::KeyEvent key) override;
-	bool mouseEvent(PIKbdListener::MouseEvent me);
+	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;
@@ -150,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() {}
@@ -160,16 +169,18 @@ public:
 	PIScreenTypes::CellFormat format;
 	PIString text;
 	bool toggled;
+
 protected:
-	void sizeHint(int & w, int & h) const;
+	void sizeHint(int & w, int & h) const override;
-	void drawEvent(PIScreenDrawer * d);
+	void drawEvent(PIScreenDrawer * d) override;
-	bool keyEvent(PIKbdListener::KeyEvent key);
+	bool keyEvent(PIKbdListener::KeyEvent key) override;
-	bool mouseEvent(PIKbdListener::MouseEvent me);
+	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() {}
@@ -178,37 +189,42 @@ public:
 	PIString suffix;
 	double maximum;
 	double value;
+
 protected:
-	void sizeHint(int & w, int & h) const;
+	void sizeHint(int & w, int & h) const override;
-	void drawEvent(PIScreenDrawer * d);
+	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);
+	void drawEvent(PIScreenDrawer * d) override;
-	bool keyEvent(PIKbdListener::KeyEvent key);
+	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 sizeHint(int & w, int & h) const override;
-	void drawEvent(PIScreenDrawer * d);
+	void drawEvent(PIScreenDrawer * d) override;
-	bool keyEvent(PIKbdListener::KeyEvent key);
+	bool keyEvent(PIKbdListener::KeyEvent key) override;
 	void reserCursor();
 	int cur, offset;
 	bool inv;

libs/main/console/piscreentypes.h

@@ -110,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; }
@@ -120,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;
 	}
 };
@@ -140,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;}
+//! \relatesalso PIBinaryStream
-inline PIByteArray & operator >>(PIByteArray & s, PIScreenTypes::Cell & v) {s >> v.format.raw_format >> v.symbol; return s;}
+//! \~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

@@ -26,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
+class PIP_CONSOLE_EXPORT PITerminal: public PIThread {
-{
+	PIOBJECT_SUBCLASS(PITerminal, PIThread);
-	PIOBJECT_SUBCLASS(PITerminal, PIThread)
-public:
 
+public:
 	//! Constructs %PITerminal
 	PITerminal();
 
@@ -53,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);
@@ -73,7 +73,6 @@ private:
 	bool cursor_blink, cursor_visible;
 	PITimeMeasurer cursor_tm;
 	PIVector<PIVector<PIScreenTypes::Cell>> cells;
-
 };
 
 

libs/main/containers/picontainers.cpp

@@ -20,11 +20,12 @@
 #include "picontainers.h"
 
 
-const ssize_t minAlloc = 64;
+const size_t minAlloc = 64;
 
 
-ssize_t _PIContainerConstantsBase::calcMinCountPoT(ssize_t szof) {
+size_t _PIContainerConstantsBase::calcMinCountPoT(size_t szof) {
-	ssize_t ret = 0, elc = 1;
+	size_t ret = 0;
+	size_t elc = 1;
 	while (elc * szof < minAlloc) {
 		elc *= 2;
 		++ret;

libs/main/containers/picontainers.h

@@ -41,12 +41,12 @@
 #else
 #  include <malloc.h>
 #endif
-#include <initializer_list>
-#include <type_traits>
-#include <string.h>
-#include <new>
 #include <algorithm>
 #include <functional>
+#include <initializer_list>
+#include <new>
+#include <string.h>
+#include <type_traits>
 
 
 template<typename C>
@@ -58,6 +58,7 @@ public:
 	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_;
 };
@@ -65,21 +66,30 @@ private:
 
 class PIP_EXPORT _PIContainerConstantsBase {
 public:
-	static ssize_t calcMinCountPoT(ssize_t szof);
+	static size_t calcMinCountPoT(size_t szof);
 };
 
 template<typename T>
 class _PIContainerConstants {
 public:
-	static ssize_t minCountPoT() {static ssize_t ret = _PIContainerConstantsBase::calcMinCountPoT(sizeof(T)); return ret;}
+	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>
-template <typename C> _PIReverseWrapper<C> PIReverseWrap(const C & c) {return _PIReverseWrapper<C>(c);}
+_PIReverseWrapper<C> PIReverseWrap(C & c) {
+	return _PIReverseWrapper<C>(c);
+}
+template<typename C>
+_PIReverseWrapper<C> PIReverseWrap(const C & c) {
+	return _PIReverseWrapper<C>(c);
+}
 
 
 //! \brief
@@ -177,7 +187,9 @@ template <typename C> _PIReverseWrapper<C> PIReverseWrap(const C & c) {return _P
 //! \~russian Порядок обхода для функции изменения размерности reshape().
 //! \~ \sa \a PIVector::reshape(), \a PIDeque::reshape()
 enum ReshapeOrder {
-	ReshapeByRow	/*! \~english Traversing elements by line, just as they stay in memory  \~russian Обход элементов построчно, так же как они находятся в памяти */,
+	ReshapeByRow /*! \~english Traversing elements by line, just as they stay in memory  \~russian Обход элементов построчно, так же как они
+	                находятся в памяти */
+		,
 	ReshapeByColumn /*! \~english Traversing elements by column \~russian Обход элементов по столбцам */,
 };
 

libs/main/containers/picontainersmodule.h

@@ -180,12 +180,12 @@
 #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"
 
 

libs/main/containers/pideque.h

@@ -75,9 +75,9 @@
 //! if the number of elements is known beforehand.
 //!
 //! The complexity (efficiency) of common operations on PIDeque is as follows:
-//! - Random access - constant 𝓞(1)
+//! - Random access - constant O(1)
-//! - Insertion or removal of elements at the end or begin - amortized constant 𝓞(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 𝓞(n)
+//! - Insertion or removal of elements - linear in the distance to the end of the array O(n)
 //!
 //! \~russian
 //! Элементы хранятся непрерывно, а значит доступны не только через итераторы,
@@ -109,9 +109,9 @@
 //! если количество элементов известно заранее.
 //!
 //! Сложность (эффективность) обычных операций над PIDeque следующая:
-//! - Произвольный доступ — постоянная 𝓞(1)
+//! - Произвольный доступ — постоянная O(1)
-//! - Вставка и удаление элементов в конце или начале — амортизированная постоянная 𝓞(1)
+//! - Вставка и удаление элементов в конце или начале — амортизированная постоянная O(1)
-//! - Вставка и удаление элементов — линейная по расстоянию до конца массива 𝓞(n)
+//! - Вставка и удаление элементов — линейная по расстоянию до конца массива O(n)
 //!
 //! \~\sa \a PIVector, \a PIMap
 template<typename T>
@@ -127,13 +127,11 @@ public:
 
 	//! \~english Constructs an empty array.
 	//! \~russian Создает пустой массив.
-	inline PIDeque(): pid_data(0), pid_size(0), pid_rsize(0), pid_start(0) {
+	inline PIDeque() { PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T)) }
-		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
-	}
 
 	//! \~english Copy constructor.
 	//! \~russian Копирующий конструктор.
-	inline PIDeque(const PIDeque<T> & other): pid_data(0), pid_size(0), pid_rsize(0), pid_start(0) {
+	inline PIDeque(const PIDeque<T> & other) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
 		alloc_forward(other.pid_size);
 		newT(pid_data + pid_start, other.pid_data + other.pid_start, pid_size);
@@ -148,7 +146,7 @@ public:
 	//! PIDeque <int> v{1,2,3};
 	//! piCout << v; // {1, 2, 3}
 	//! \endcode
-	inline PIDeque(std::initializer_list<T> init_list): pid_data(0), pid_size(0), pid_rsize(0), pid_start(0) {
+	inline PIDeque(std::initializer_list<T> init_list) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
 		alloc_forward(init_list.size());
 		newT(pid_data, init_list.begin(), init_list.size());
@@ -158,7 +156,7 @@ public:
 	//! This constructor reserve `size` and copy from `data` pointer.
 	//! \~russian Создает массив из указателя на данные `data` и размер `size`.
 	//! То есть выделяет память для `size` элементов и копирует данные из указателя `data`.
-	inline PIDeque(const T * data, size_t size): pid_data(0), pid_size(0), pid_rsize(0), pid_start(0) {
+	inline PIDeque(const T * data, size_t size) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
 		alloc_forward(size);
 		newT(pid_data + pid_start, data, pid_size);
@@ -166,9 +164,9 @@ public:
 
 	//! \~english Contructs array with size `size` filled elements `e`.
 	//! \~russian Создает массив из `size` элементов заполненных `e`.
-	inline PIDeque(size_t pid_size, const T & e = T()): pid_data(0), pid_size(0), pid_rsize(0), pid_start(0) {
+	inline explicit PIDeque(size_t pid_size, const T & e = T()) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
-		resize(pid_size, e);
+		expand(pid_size, e);
 	}
 
 	//! \~english Contructs array with size `size` and elements created by function `f(size_t i)`.
@@ -184,31 +182,34 @@ public:
 	//! 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): pid_data(0), pid_size(0), pid_rsize(0), pid_start(0) {
+	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);
 	}
 
 	//! \~english Move constructor.
 	//! \~russian Перемещающий конструктор.
-	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) {
+	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);
+		clear();
 		alloc_forward(other.pid_size);
 		newT(pid_data + pid_start, other.pid_data + other.pid_start, pid_size);
 		return *this;
@@ -223,10 +224,12 @@ public:
 
 	class iterator {
 		friend class PIDeque<T>;
+
 	private:
 		inline iterator(PIDeque<T> * v, ssize_t p): parent(v), pos(p) {}
 		PIDeque<T> * parent;
 		ssize_t pos;
+
 	public:
 		typedef T value_type;
 		typedef T * pointer;
@@ -246,7 +249,7 @@ public:
 			return *this;
 		}
 		inline iterator operator++(int) {
-			auto tmp = *this;
+			const auto tmp = *this;
 			++*this;
 			return tmp;
 		}
@@ -255,7 +258,7 @@ public:
 			return *this;
 		}
 		inline iterator operator--(int) {
-			auto tmp = *this;
+			const auto tmp = *this;
 			--*this;
 			return tmp;
 		}
@@ -283,9 +286,7 @@ public:
 			tmp -= p;
 			return tmp;
 		}
-		friend inline std::ptrdiff_t operator -(const iterator & it1, const iterator & it2) {
+		friend inline std::ptrdiff_t operator-(const iterator & it1, const iterator & it2) { return it1.pos - it2.pos; }
-			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) {
@@ -296,26 +297,20 @@ public:
 
 		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) {
+		friend inline bool operator<(const iterator & it1, const iterator & it2) { return it1.pos < it2.pos; }
-			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) {
+		friend inline bool operator>=(const iterator & it1, const iterator & it2) { return it1.pos >= it2.pos; }
-			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, ssize_t p): parent(v), pos(p) {}
 		const PIDeque<T> * parent;
 		ssize_t pos;
+
 	public:
 		typedef T value_type;
 		typedef T * pointer;
@@ -333,7 +328,7 @@ public:
 			return *this;
 		}
 		inline const_iterator operator++(int) {
-			auto tmp = *this;
+			const auto tmp = *this;
 			++*this;
 			return tmp;
 		}
@@ -342,7 +337,7 @@ public:
 			return *this;
 		}
 		inline const_iterator operator--(int) {
-			auto tmp = *this;
+			const auto tmp = *this;
 			--*this;
 			return tmp;
 		}
@@ -370,9 +365,7 @@ public:
 			tmp -= p;
 			return tmp;
 		}
-		friend inline std::ptrdiff_t operator -(const const_iterator & it1, const const_iterator & it2) {
+		friend inline std::ptrdiff_t operator-(const const_iterator & it1, const const_iterator & it2) { return it1.pos - it2.pos; }
-			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) {
@@ -383,26 +376,20 @@ public:
 
 		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) {
+		friend inline bool operator<(const const_iterator & it1, const const_iterator & it2) { return it1.pos < it2.pos; }
-			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) {
+		friend inline bool operator>=(const const_iterator & it1, const const_iterator & it2) { return it1.pos >= it2.pos; }
-			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, ssize_t p): parent(v), pos(p) {}
 		PIDeque<T> * parent;
 		ssize_t pos;
+
 	public:
 		typedef T value_type;
 		typedef T * pointer;
@@ -422,7 +409,7 @@ public:
 			return *this;
 		}
 		inline reverse_iterator operator++(int) {
-			auto tmp = *this;
+			const auto tmp = *this;
 			--*this;
 			return tmp;
 		}
@@ -431,7 +418,7 @@ public:
 			return *this;
 		}
 		inline reverse_iterator operator--(int) {
-			auto tmp = *this;
+			const auto tmp = *this;
 			++*this;
 			return tmp;
 		}
@@ -459,9 +446,7 @@ public:
 			tmp -= p;
 			return tmp;
 		}
-		friend inline std::ptrdiff_t operator -(const reverse_iterator & it1, const reverse_iterator & it2) {
+		friend inline std::ptrdiff_t operator-(const reverse_iterator & it1, const reverse_iterator & it2) { return it2.pos - it1.pos; }
-			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) {
@@ -472,26 +457,20 @@ public:
 
 		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) {
+		friend inline bool operator<(const reverse_iterator & it1, const reverse_iterator & it2) { return it1.pos < it2.pos; }
-			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) {
+		friend inline bool operator>=(const reverse_iterator & it1, const reverse_iterator & it2) { return it1.pos >= it2.pos; }
-			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, ssize_t p): parent(v), pos(p) {}
 		const PIDeque<T> * parent;
 		ssize_t pos;
+
 	public:
 		typedef T value_type;
 		typedef T * pointer;
@@ -508,7 +487,7 @@ public:
 			return *this;
 		}
 		inline const_reverse_iterator operator++(int) {
-			auto tmp = *this;
+			const auto tmp = *this;
 			--*this;
 			return tmp;
 		}
@@ -517,7 +496,7 @@ public:
 			return *this;
 		}
 		inline const_reverse_iterator operator--(int) {
-			auto tmp = *this;
+			const auto tmp = *this;
 			++*this;
 			return tmp;
 		}
@@ -558,18 +537,10 @@ public:
 
 		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) {
+		friend inline bool operator<(const const_reverse_iterator & it1, const const_reverse_iterator & it2) { return it1.pos < it2.pos; }
-			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) {
+		friend inline bool operator>=(const const_reverse_iterator & it1, const const_reverse_iterator & it2) { return it1.pos >= it2.pos; }
-			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;
-		}
 	};
 
 
@@ -613,7 +584,8 @@ public:
 
 	//! \~english Returns a reverse iterator to the element.
 	//! following the last element of the reversed array.
-	//! \~russian Обратный итератор на элемент, следующий за последним элементом.
+	//! \~russian Обратный итератор на элемент,
+	//! следующий за последним элементом.
 	//! \~\details ![rbegin, rend](doc/images/pivector_rbegin.png)
 	//!
 	//! \~english It corresponds to the element preceding the first element of the non-reversed array.
@@ -645,7 +617,7 @@ public:
 	inline size_t length() const { return pid_size; }
 
 	//! \~english Number of elements that the container has currently allocated space for.
-	//! \~russian Количество элементов, для которого сейчас выделена память контейнером.
+	//! \~russian Количество элементов, для которого сейчас выделена память массивом.
 	//! \~\details
 	//! \~english To find out the actual number of items, use the function \a size().
 	//! \~russian Чтобы узнать фактическое количество элементов используйте функцию \a size().
@@ -655,18 +627,18 @@ public:
 	inline size_t _start() const { return pid_start; }
 
 	//! \~english Checks if the container has no elements.
-	//! \~russian Проверяет пуст ли контейнер.
+	//! \~russian Проверяет пуст ли массив.
 	//! \~\return
 	//! \~english **true** if the container is empty, **false** otherwise
-	//! \~russian **true** если контейнер пуст, **false** иначе.
+	//! \~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 Проверяет не пуст ли контейнер.
+	//! \~russian Проверяет не пуст ли массив.
 	//! \~\return
 	//! \~english **true** if the container is not empty, **false** otherwise
-	//! \~russian **true** если контейнер не пуст, **false** иначе.
+	//! \~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); }
 
@@ -689,7 +661,7 @@ public:
 	//! \endcode
 	//! \~\sa \a every(), \a contains(), \a entries(), \a forEach()
 	inline bool any(std::function<bool(const T & e)> test) const {
-		for (ssize_t i = pid_start; i < pid_start + (ssize_t)pid_size; ++i) {
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
 			if (test(pid_data[i])) return true;
 		}
 		return false;
@@ -714,7 +686,7 @@ public:
 	//! \endcode
 	//! \~\sa \a any(), \a contains(), \a entries(), \a forEach()
 	inline bool every(std::function<bool(const T & e)> test) const {
-		for (ssize_t i = pid_start; i < pid_start + (ssize_t)pid_size; ++i) {
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
 			if (!test(pid_data[i])) return false;
 		}
 		return true;
@@ -750,6 +722,34 @@ public:
 	//! Иначе это приведёт к неопределённому поведению программы и ошибкам памяти.
 	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
@@ -804,7 +804,7 @@ public:
 	//! возвращается **false**, что означает, что массив даже не просматривается.
 	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
 	//! Если рассчитанный индекс все равно оказывается меньше 0, просматривается весь массив.
-	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу (слева на право).
 	//! Значение по умолчанию равно 0, что означает, что просматривается весь массив.
 	//! \~\code
 	//! PIDeque<int> v{1, 2, 3, 4};
@@ -825,12 +825,39 @@ public:
 			start = pid_size + start;
 			if (start < 0) start = 0;
 		}
-		for (ssize_t i = pid_start + start; i < pid_start + (ssize_t)pid_size; ++i) {
+		for (size_t i = pid_start + size_t(start); i < pid_start + pid_size; ++i) {
 			if (e == pid_data[i]) return true;
 		}
 		return false;
 	}
 
+	//! \~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;
+	}
+
 	//! \~english Count elements equal `e` in the array.
 	//! \~russian Подсчитывает количество элементов, совпадающих с элементом `e` в массиве.
 	//! \~\details
@@ -847,7 +874,7 @@ public:
 	//! возвращается 0, что означает, что массив даже не просматривается.
 	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
 	//! Если рассчитанный индекс все равно оказывается меньше 0, просматривается весь массив.
-	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу (слева на право).
 	//! Значение по умолчанию равно 0, что означает, что просматривается весь массив.
 	//! \~\code
 	//! PIDeque<int> v{2, 2, 4, 2, 6};
@@ -856,13 +883,13 @@ public:
 	//! piCout << v.entries(2, -4); // 2
 	//! \endcode
 	//! \~\sa \a every(), \a any(), \a contains(), \a forEach(), \a indexOf()
-	inline int entries(const T & e, size_t start = 0) const {
+	inline int entries(const T & e, ssize_t start = 0) const {
 		int ec = 0;
 		if (start < 0) {
 			start = pid_size + start;
 			if (start < 0) start = 0;
 		}
-		for (ssize_t i = pid_start + start; i < pid_start + (ssize_t)pid_size; ++i) {
+		for (size_t i = pid_start + size_t(start); i < pid_start + pid_size; ++i) {
 			if (e == pid_data[i]) ++ec;
 		}
 		return ec;
@@ -887,16 +914,16 @@ public:
 	//! возвращается 0, что означает, что массив даже не просматривается.
 	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
 	//! Если рассчитанный индекс все равно оказывается меньше 0, просматривается весь массив.
-	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу (слева на право).
 	//! Значение по умолчанию равно 0, что означает, что просматривается весь массив.
 	//! \~\sa \a every(), \a any(), \a contains(), \a forEach(), \a indexWhere()
-	inline int entries(std::function<bool(const T & e)> test, size_t start = 0) const {
+	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 (ssize_t i = pid_start + start; i < pid_start + (ssize_t)pid_size; ++i) {
+		for (size_t i = pid_start + size_t(start); i < pid_start + pid_size; ++i) {
 			if (test(pid_data[i])) ++ec;
 		}
 		return ec;
@@ -920,7 +947,7 @@ public:
 	//! возвращается `-1`, что означает, что массив даже не просматривается.
 	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
 	//! Если рассчитанный индекс все равно оказывается меньше 0, просматривается весь массив.
-	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу (слева на право).
 	//! Значение по умолчанию равно 0, что означает, что просматривается весь массив.
 	//! \~\code
 	//! PIDeque<int> v{2, 5, 9};
@@ -931,14 +958,14 @@ public:
 	//! piCout << v.indexOf(2, -3); // 0
 	//! \endcode
 	//! \~\sa \a indexWhere(), \a lastIndexOf(), \a lastIndexWhere(), \a contains()
-	inline ssize_t indexOf(const T & e, size_t start = 0) const {
+	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 (ssize_t i = pid_start + start; i < pid_start + (ssize_t)pid_size; ++i) {
+		for (size_t i = pid_start + size_t(start); i < pid_start + pid_size; ++i) {
 			if (e == pid_data[i]) {
-				return i - pid_start;
+				return ssize_t(i) - pid_start;
 			}
 		}
 		return -1;
@@ -963,7 +990,7 @@ public:
 	//! возвращается `-1`, что означает, что массив даже не просматривается.
 	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
 	//! Если рассчитанный индекс все равно оказывается меньше 0, просматривается весь массив.
-	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу (слева на право).
 	//! Значение по умолчанию равно 0, что означает, что просматривается весь массив.
 	//! \~\code
 	//! PIDeque<PIString> v{"do", "re", "mi", "re"};
@@ -972,14 +999,14 @@ public:
 	//! 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, size_t start = 0) const {
+	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 (ssize_t i = pid_start + start; i < pid_start + (ssize_t)pid_size; ++i) {
+		for (size_t i = pid_start + size_t(start); i < pid_start + pid_size; ++i) {
 			if (test(pid_data[i])) {
-				return i - pid_start;
+				return ssize_t(i) - pid_start;
 			}
 		}
 		return -1;
@@ -1005,7 +1032,7 @@ public:
 	//! c которого начинать поиск в обратном направлении.
 	//! Если индекс больше или равен длине массива, просматривается весь массив.
 	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
-	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от конца к началу.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от конца к началу (справа на лево).
 	//! Если рассчитанный индекс оказывается меньше 0, массив даже не просматривается.
 	//! Значение по умолчанию равно `-1`, что равно индексу последнего элемента
 	//! и означает, что просматривается весь массив.
@@ -1022,9 +1049,9 @@ public:
 	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 = pid_start + start; i >= pid_start; --i) {
+		for (ssize_t i = ssize_t(pid_start) + start; i >= ssize_t(pid_start); --i) {
 			if (e == pid_data[i]) {
-				return i - pid_start;
+				return i - ssize_t(pid_start);
 			}
 		}
 		return -1;
@@ -1050,7 +1077,7 @@ public:
 	//! c которого начинать поиск в обратном направлении.
 	//! Если индекс больше или равен длине массива, просматривается весь массив.
 	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
-	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от конца к началу.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от конца к началу (справа на лево).
 	//! Если рассчитанный индекс оказывается меньше 0, массив даже не просматривается.
 	//! Значение по умолчанию равно `-1`, что равно индексу последнего элемента
 	//! и означает, что просматривается весь массив.
@@ -1058,9 +1085,9 @@ public:
 	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 = pid_start + start; i >= pid_start; --i) {
+		for (ssize_t i = ssize_t(pid_start) + start; i >= ssize_t(pid_start); --i) {
 			if (test(pid_data[i])) {
-				return i - pid_start;
+				return i - ssize_t(pid_start);
 			}
 		}
 		return -1;
@@ -1119,7 +1146,7 @@ public:
 	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);
+		return PIDeque(pid_data + pid_start + index, count);
 	}
 
 	//! \~english Clear array, remove all elements.
@@ -1129,16 +1156,14 @@ public:
 	//! \~english Reserved memory will not be released.
 	//! \~russian Зарезервированная память не освободится.
 	//! \~\sa \a resize()
-	template<typename T1 = T, typename std::enable_if<
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
-				 !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<
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
 	inline PIDeque<T> & clear() {
 		PIINTROSPECTION_CONTAINER_UNUSED(T, pid_size)
 		pid_size  = 0;
@@ -1190,16 +1215,12 @@ public:
 	//! \~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<
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
-				 !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(e);
 	}
-	template<typename T1 = T, typename std::enable_if<
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
-				 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(e);
@@ -1217,20 +1238,12 @@ public:
 	//! лишние элементы удаляются с конца массива.
 	//! \~\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) {
+		} else if (new_size > pid_size) {
-				pid_start = (pid_rsize - pid_size) / 2;
+			expand(new_size, e);
-			}
-		}
-		if (new_size > pid_size) {
-			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);
-			}
 		}
 		return *this;
 	}
@@ -1247,41 +1260,31 @@ public:
 	//! лишние элементы удаляются с конца массива.
 	//! \~\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[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) {
+		} else if (new_size > pid_size) {
-				pid_start = (pid_rsize - pid_size) / 2;
+			expand(new_size, f);
-			}
-		}
-		if (new_size > pid_size) {
-			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));
-			}
 		}
 		return *this;
 	}
 
-	template<typename T1 = T, typename std::enable_if<
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
-				 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));
 		}
+#endif
 		alloc_forward(new_size);
 		return *this;
 	}
 
-	inline void _copyRaw(T * dst, const T * src, size_t size) {
+	inline void _copyRaw(T * dst, const T * src, size_t size) { newT(dst, src, size); }
-		newT(dst, src, size);
-	}
 
 	//! \~english Attempts to allocate memory for at least `new_size` elements.
 	//! \~russian Резервируется память под как минимум `new_size` элементов.
@@ -1299,7 +1302,7 @@ public:
 	//! \~\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;
+		const size_t os = pid_size;
 		alloc_forward(new_size);
 		pid_size = os;
 		return *this;
@@ -1319,17 +1322,21 @@ public:
 	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_forward(pid_size + 1);
 			if (index < pid_size - 1) {
-				size_t os = pid_size - index - 1;
+				const 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));
+				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((void*)(&(pid_data[pid_start])), (const void*)(&(pid_data[pid_start + 1])), index * sizeof(T));
+				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, e);
@@ -1345,17 +1352,21 @@ public:
 	inline PIDeque<T> & insert(size_t index, T && e) {
 		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_forward(pid_size + 1);
 			if (index < pid_size - 1) {
-				size_t os = pid_size - index - 1;
+				const 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));
+				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((void*)(&(pid_data[pid_start])), (const void*)(&(pid_data[pid_start + 1])), index * sizeof(T));
+				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));
@@ -1372,21 +1383,25 @@ public:
 		if (v.isEmpty()) return *this;
 #ifndef NDEBUG
 		if (&v == this) {
-			printf("error with PIDeque<%s>::insert\n", __PIP_TYPENAME__(T));
+			fprintf(stderr, "error with PIDeque<%s>::insert\n", __PIP_TYPENAME__(T));
 		}
 #endif
 		assert(&v != this);
-		bool dir = pid_rsize <= 2 ? true : (index >= pid_rsize / 2 ? true : false);
+		const bool dir = v.size() > pid_size ? true : (index >= pid_rsize / 2 ? true : false);
 		if (dir) {
-			ssize_t os = pid_size - index;
+			const ssize_t os = pid_size - index;
 			alloc_forward(pid_size + v.pid_size);
 			if (os > 0) {
-				memmove((void*)(&(pid_data[index + pid_start + v.pid_size])), (const void*)(&(pid_data[index + pid_start])), os * sizeof(T));
+				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((void*)(&(pid_data[pid_start])), (const void*)(&(pid_data[pid_start + v.pid_size])), index * sizeof(T));
+				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);
@@ -1404,17 +1419,22 @@ public:
 	//! [списка инициализации 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) {
-		bool dir = pid_rsize <= 2 ? true : (index >= pid_rsize / 2 ? true : false);
+		if (init_list.size() == 0) return *this;
+		const bool dir = init_list.size() > pid_size ? true : (index >= pid_rsize / 2 ? true : false);
 		if (dir) {
-			ssize_t os = pid_size - index;
+			const ssize_t os = ssize_t(pid_size) - index;
 			alloc_forward(pid_size + init_list.size());
 			if (os > 0) {
-				memmove((void*)(&(pid_data[index + pid_start + init_list.size()])), (const void*)(&(pid_data[index + pid_start])), os * sizeof(T));
+				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((void*)(&(pid_data[pid_start])), (const void*)(&(pid_data[pid_start + init_list.size()])), index * sizeof(T));
+				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());
@@ -1433,22 +1453,27 @@ public:
 	inline PIDeque<T> & remove(size_t index, size_t count = 1) {
 		if (count == 0) return *this;
 		if (index + count >= pid_size) {
-			resize(index);
+			if (index < pid_size) {
-			return *this;
+				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 {
+			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((void*)(&(pid_data[pid_start + count])), (const void*)(&(pid_data[pid_start])), index * sizeof(T));
+					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;
 	}
 
@@ -1461,7 +1486,7 @@ public:
 		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);
 	}
 
 	//! \~english Sorts the elements in non-descending order.
@@ -1503,16 +1528,11 @@ public:
 	//! Complexity `O(N·log(N))`.
 	//! \~russian Сохранность порядка элементов, имеющих одинаковое значение, не гарантируется.
 	//! Для сравнения элементов используется функция сравнения `comp`.
-	//! Функция сравнения, возвращает ​`true` если первый аргумент меньше второго.
+	//! Функция сравнения, возвращает ​`true` если первый аргумент меньше
-	//! Сигнатура функции сравнения должна быть эквивалентна следующей:
+	//! второго. Сигнатура функции сравнения должна быть эквивалентна следующей: \code bool comp(const T &a, const T &b); \endcode Сигнатура
-	//! \code
+	//! не обязана содержать const &, однако, функция не может изменять переданные объекты. Функция обязана возвращать `false` для
-	//! bool comp(const T &a, const T &b);
+	//! одинаковых элементов, иначе это приведёт к неопределённому поведению программы и ошибкам памяти. Для сортировки используется функция
-	//! \endcode
+	//! [std::sort](https://ru.cppreference.com/w/cpp/algorithm/sort). Сложность сортировки `O(N·log(N))`.
-	//! Сигнатура не обязана содержать 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;});
@@ -1542,7 +1562,7 @@ public:
 	//! \endcode
 	//! \~\sa \a reversed()
 	inline PIDeque<T> & reverse() {
-		size_t s2 = pid_size/2;
+		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]);
 		}
@@ -1572,10 +1592,12 @@ public:
 	//! Если `add_size < 0`, то с конца массива удаляются элементы.
 	//! Если `add_size < 0` и в массиве меньше элементов чем указано, то массив становится пустым.
 	//! \~\sa \a resize()
-	inline PIDeque<T> & enlarge(llong pid_size) {
+	inline PIDeque<T> & enlarge(ssize_t add_size, const T & e = T()) {
-		llong ns = size_s() + pid_size;
+		const ssize_t ns = size_s() + add_size;
-		if (ns <= 0) clear();
+		if (ns <= 0)
-		else resize(size_t(ns));
+			clear();
+		else
+			resize(size_t(ns), e);
 		return *this;
 	}
 
@@ -1608,12 +1630,15 @@ public:
 	//! \endcode
 	//! \~\sa \a remove(), \a removeOne(), \a removeWhere()
 	inline PIDeque<T> & removeAll(const T & e) {
-		for (ssize_t i = 0; i < ssize_t(pid_size); ++i) {
+		ssize_t j = indexOf(e);
-			if (pid_data[i + pid_start] == e) {
+		if (j != -1) {
-				remove(i);
+			for (size_t i = j + 1; i < pid_size; ++i) {
-				--i;
+				if (pid_data[i + pid_start] != e) {
+					pid_data[j++ + pid_start] = std::move(pid_data[i + pid_start]);
 				}
 			}
+			remove(j, pid_size - j);
+		}
 		return *this;
 	}
 
@@ -1629,12 +1654,15 @@ public:
 	//! \endcode
 	//! \~\sa \a remove(), \a removeOne(), \a removeWhere()
 	inline PIDeque<T> & removeWhere(std::function<bool(const T & e)> test) {
-		for (ssize_t i = 0; i < ssize_t(pid_size); ++i) {
+		ssize_t j = indexWhere(test);
-			if (test(pid_data[i + pid_start])) {
+		if (j != -1) {
-				remove(i);
+			for (size_t i = j + 1; i < pid_size; ++i) {
-				--i;
+				if (!test(pid_data[i + pid_start])) {
+					pid_data[j++ + pid_start] = std::move(pid_data[i + pid_start]);
 				}
 			}
+			remove(j, pid_size - j);
+		}
 		return *this;
 	}
 
@@ -1693,7 +1721,8 @@ public:
 	//! [списка инициализации 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) {
-		size_t ps = pid_size;
+		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;
@@ -1706,13 +1735,14 @@ public:
 	//! \~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));
+			fprintf(stderr, "error with PIDeque<%s>::append\n", __PIP_TYPENAME__(T));
 		}
 #endif
 		assert(&v != this);
-		size_t ps = pid_size;
+		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;
@@ -1835,7 +1865,9 @@ public:
 	//! \endcode
 	//! \~\sa \a push_back(), \a append(), \a prepend(), \a insert()
 	inline PIDeque<T> & push_front(const T & e) {
-		insert(0, e);
+		if (isEmpty()) return push_back(e);
+		alloc_backward(pid_size + 1, -1);
+		elementNew(pid_data + pid_start, e);
 		return *this;
 	}
 
@@ -1846,7 +1878,9 @@ public:
 	//! \~russian Перегруженая функция.
 	//! \~\sa \a push_front()
 	inline PIDeque<T> & push_front(T && e) {
-		insert(0, std::move(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;
 	}
 
@@ -1861,10 +1895,7 @@ public:
 	//! piCout << v; // {4, 5, 1, 2, 3}
 	//! \endcode
 	//! \~\sa \a push_front()
-	inline PIDeque<T> & push_front(const PIDeque<T> & v) {
+	inline PIDeque<T> & push_front(const PIDeque<T> & v) { return insert(0, v); }
-		insert(0, v);
-		return *this;
-	}
 
 	//! \~english Appends the given elements to the begin of the array.
 	//! \~russian Добавляет элементы в начало массива.
@@ -1876,10 +1907,7 @@ public:
 	//! Добавляет элементы из
 	//! [списка инициализации 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) {
+	inline PIDeque<T> & push_front(std::initializer_list<T> init_list) { return insert(0, init_list); }
-		insert(0, init_list);
-		return *this;
-	}
 
 	//! \~english Appends the given element `e` to the begin of the array.
 	//! \~russian Добавляет элемент `e` в начало массива.
@@ -1938,7 +1966,7 @@ public:
 	//! Добавляет элементы из
 	//! [списка инициализации 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 prepend(init_list);}
+	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 Удаляет один элемент с конца массива.
@@ -1955,7 +1983,8 @@ public:
 	//! \~\sa \a pop_front(), \a take_back(), \a take_front()
 	inline PIDeque<T> & pop_back() {
 		if (pid_size == 0) return *this;
-		resize(pid_size - 1);
+		elementDelete(pid_data[pid_size + pid_start - 1]);
+		pid_size = pid_size - 1;
 		return *this;
 	}
 
@@ -1976,7 +2005,9 @@ public:
 	//! \~\sa \a pop_back(), \a take_back(), \a take_front()
 	inline PIDeque<T> & pop_front() {
 		if (pid_size == 0) return *this;
-		remove(0);
+		elementDelete(pid_data[pid_start]);
+		pid_start += 1;
+		pid_size -= 1;
 		return *this;
 	}
 
@@ -1990,7 +2021,7 @@ public:
 	//! \endcode
 	//! \~\sa \a take_front(), \a pop_back(), \a pop_front()
 	inline T take_back() {
-		T e(back());
+		const T e(back());
 		pop_back();
 		return e;
 	}
@@ -2005,7 +2036,7 @@ public:
 	//! \endcode
 	//! \~\sa \a take_front(), \a pop_back(), \a pop_front()
 	inline T take_front() {
-		T e(front());
+		const T e(front());
 		pop_front();
 		return e;
 	}
@@ -2022,6 +2053,7 @@ public:
 	template<typename ST>
 	inline PIDeque<ST> toType() const {
 		PIDeque<ST> ret(pid_size);
+		ret.reserve(pid_size);
 		for (size_t i = 0; i < pid_size; ++i) {
 			ret[i] = ST(pid_data[i + pid_start]);
 		}
@@ -2029,9 +2061,9 @@ public:
 	}
 
 	//! \~english Returns a new array with all elements
-	//! that pass the test implemented by the provided function `test`.
+	//! that pass the test implemented by the provided function `bool test(const T & e)`.
 	//! \~russian Возвращает новый массив со всеми элементами,
-	//! прошедшими проверку, задаваемую в передаваемой функции `test`.
+	//! прошедшими проверку, задаваемую в передаваемой функции `bool test(const T & e)`.
 	//! \~\details
 	//! \~\code
 	//! PIDeque<int> v{3, 2, 5, 2, 7};
@@ -2047,6 +2079,39 @@ public:
 		return ret;
 	}
 
+	//! \~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
@@ -2087,6 +2152,63 @@ public:
 		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 Создаёт новый массив с результатом вызова указанной функции
@@ -2096,23 +2218,78 @@ public:
 	//! 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"}
+	//! piCout << sl; // {"1", "2", "3"}
 	//! \endcode
 	//! \~\sa \a forEach(), \a reduce()
 	template<typename ST>
 	inline PIDeque<ST> map(std::function<ST(const T & e)> f) const {
-		PIDeque<ST> ret; ret.reserve(pid_size);
+		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;
 	}
 
+	//! \~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)`
@@ -2133,7 +2310,7 @@ public:
 	//! \param initial _optional_ Object used as the second argument
 	//! when the `f` function is first called.
 	//! \~russian Метод reduce() выполняет функцию `f`
-	//! один раз для каждого элемента, присутствующего в массиве.
+	//! один раз для каждого элемента, присутствующего в массиве от начала к концу (слева на право).
 	//! Если при вызове reduce() передан аргумент `initial`,
 	//! то при первом вызове функции `f` значение `acc`
 	//! будет равным значению `initial`.
@@ -2153,7 +2330,7 @@ public:
 	//! int s = v.reduce<int>([](const int & e, const int & acc){return e + acc;});
 	//! piCout << s; // 15
 	//! \endcode
-	//! \~\sa \a forEach(), \a map()
+	//! \~\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);
@@ -2163,6 +2340,42 @@ public:
 		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
@@ -2187,11 +2400,11 @@ public:
 		if (isEmpty()) return ret;
 #ifndef NDEBUG
 		if (rows * cols != pid_size) {
-			printf("error with PIDeque<%s>::reshape\n", __PIP_TYPENAME__(T));
+			fprintf(stderr, "error with PIDeque<%s>::reshape\n", __PIP_TYPENAME__(T));
 		}
 #endif
 		assert(rows * cols == pid_size);
-		ret.resize(rows);
+		ret.expand(rows);
 		if (order == ReshapeByRow) {
 			for (size_t r = 0; r < rows; r++) {
 				ret[r] = PIDeque<T>(&(pid_data[r * cols]), cols);
@@ -2199,7 +2412,7 @@ public:
 		}
 		if (order == ReshapeByColumn) {
 			for (size_t r = 0; r < rows; r++) {
-				ret[r].resize(cols);
+				ret[r].expand(cols);
 				for (size_t c = 0; c < cols; c++) {
 					ret[r][c] = pid_data[c * rows + r];
 				}
@@ -2222,14 +2435,12 @@ public:
 	//! 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<
+	template<typename C, typename std::enable_if<std::is_same<T, PIDeque<C>>::value, int>::type = 0>
-				 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();
+		const size_t rows = size();
-		size_t cols = at(0).size();
+		const size_t cols = at(0).size();
 		ret.reserve(rows * cols);
 		if (order == ReshapeByRow) {
 			for (size_t r = 0; r < rows; r++) {
@@ -2265,119 +2476,220 @@ public:
 	//! 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<
+	template<typename C, typename std::enable_if<std::is_same<T, PIDeque<C>>::value, int>::type = 0>
-				 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)) {
+		if (pid_rsize * 2 >= size_t(s) && pid_rsize < size_t(s)) {
-			return pid_rsize + pid_rsize;
+			return pid_rsize * 2;
 		}
-		ssize_t t = _PIContainerConstants<T>::minCountPoT(), s_ = s - 1;
+		size_t t = _PIContainerConstants<T>::minCountPoT();
-		while (s_ >> t)
+		s -= 1;
+		while (s >> t) {
 			++t;
+		}
 		return (1 << t);
 	}
-	template<typename T1 = T, typename std::enable_if<
+
-			!std::is_trivially_copyable<T1>::value
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
-			, 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
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
-			, int>::type = 0>
 	inline void deleteT(T * d, size_t sz) {
 		PIINTROSPECTION_CONTAINER_UNUSED(T, sz)
-		if ((uchar*)d != 0) {
+		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
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
-				 , 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
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
-				 , int>::type = 0>
+	inline void elementNew(T * to, const T & from) {
-	inline void elementNew(T * to, const T & from) {new(to)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, 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))) {
+				if (pid_start < (pid_size * 2) || ssize_t(pid_start) > (ssize_t(pid_rsize) - (ssize_t(pid_size) * 2))) {
-					ssize_t ns = (pid_rsize - 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_forward(size_t new_size) { // direction == true -> alloc forward
+
+	inline void alloc_forward(size_t new_size) {
 		if (pid_start + new_size <= pid_rsize) {
 			pid_size = new_size;
-				checkMove();
+			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));
+				fprintf(stderr, "error with PIDeque<%s>::alloc\n", __PIP_TYPENAME__(T));
 			}
 #endif
 			assert(p_d);
@@ -2385,19 +2697,15 @@ private:
 			pid_rsize = as;
 		}
 	}
-	inline void alloc_backward(size_t new_size, ssize_t start_offset = 0) { //alloc backward
+
-			size_t as;
+	inline void alloc_backward(size_t new_size, ssize_t start_offset = 0) {
-			if (pid_start + start_offset < 0) {
+		const size_t as = ssize_t(pid_start) + start_offset < 0 ? asize(pid_rsize - start_offset) : pid_rsize;
-				as = asize(pid_rsize - start_offset);
-			} else {
-				as = pid_rsize;
-			}
 		if (as > pid_rsize) {
-				T * td = (T*)(malloc(as * sizeof(T)));
+			T * td          = reinterpret_cast<T *>(malloc(as * sizeof(T)));
-				ssize_t ns = pid_start + as - pid_rsize;
+			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;
@@ -2409,9 +2717,28 @@ private:
 		checkMove();
 	}
 
-	T * pid_data;
+	inline void expand(size_t new_size, const T & e = T()) {
-	size_t pid_size, pid_rsize;
+		const size_t os = pid_size;
-	ssize_t pid_start;
+		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);
+		}
+	}
+
+	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;
 };
 
 
@@ -2437,19 +2764,21 @@ inline std::ostream & operator <<(std::ostream & s, const PIDeque<T> & v) {
 template<typename T>
 inline PICout operator<<(PICout s, const PIDeque<T> & v) {
 	s.space();
-	s.setControl(0, true);
+	s.saveAndSetControls(0);
 	s << "{";
 	for (size_t i = 0; i < v.size(); ++i) {
 		s << v[i];
 		if (i < v.size() - 1) s << ", ";
 	}
 	s << "}";
-	s.restoreControl();
+	s.restoreControls();
 	return s;
 }
 
 template<typename T>
-inline void piSwap(PIDeque<T> & f, PIDeque<T> & s) {f.swap(s);}
+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
+//! \addtogroup Containers
- * \brief Associative array with custom types of key and value
+//! \{
- * 
+//! \file pimap.h
- * This file declares PIMap
+//! \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,66 +34,100 @@
 #ifndef PIMAP_H
 #define PIMAP_H
 
-#include "pivector.h"
 #include "pideque.h"
 #include "pipair.h"
+#include "pivector.h"
 
 
-template<class T>
+template<typename Key, typename T>
-void piQuickSort(T * a, ssize_t N) {
+class PIMapIteratorConst;
-	if (N < 1) return;
+template<typename Key, typename T>
-	if (N < 46) {
+class PIMapIteratorConstReverse;
-		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 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>
-	template <typename Key1, typename T1> friend PIByteArray & operator <<(PIByteArray & s, const PIMap<Key1, T1> & v);
+	friend class PIMapIteratorConst;
-	template <typename Key1, typename T1> friend class PIMapIterator;
+	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);
+
 public:
-	PIMap() {;}
+	typedef T mapped_type;
-	PIMap(const PIMap<Key, T> & other) {*this = other;}
+	typedef Key key_type;
-	PIMap(PIMap<Key, T> && other) : pim_content(std::move(other.pim_content)), pim_index(std::move(other.pim_index)) {}
+	typedef PIPair<Key, T> value_type;
-	PIMap(std::initializer_list<std::pair<Key, T>> init_list) {
+
-		for (auto i: init_list)
+	//! \~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));
 		}
-	virtual ~PIMap() {;}
+	}
 
-	PIMap<Key, T> & operator =(const PIMap<Key, T> & other) {
+	//! \~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;
@@ -92,26 +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));}
+		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; }
@@ -122,15 +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));}
+		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; }
@@ -141,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; }
@@ -157,137 +207,413 @@ 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);}
+	//! \~english Iterator to the first element.
-	PIMapIterator<Key, T> makeReverseIterator() const {return PIMapIterator<Key, T>(*this, true);}
+	//! \~russian Итератор на первый элемент.
+	inline iterator begin() { return iterator(this, 0); }
 
-	size_t size() const {return pim_content.size();}
+	//! \~english Iterator to the element following the last element.
-	int size_s() const {return pim_content.size_s();}
+	//! \~russian Итератор на элемент, следующий за последним элементом.
-	size_t length() const {return pim_content.size();}
+	inline iterator end() { return iterator(this, size()); }
-	bool isEmpty() const {return (pim_content.size() == 0);}
 
-	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);
+		const ssize_t i = _find(key, f);
-		if (f) return pim_content[pim_index[i].index];
+		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));
+			fprintf(stderr, "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() == 1) {
-		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;}
+			insert(other.pim_index[0].key, other.pim_content[0]);
-		for (int i = 0; i < other.pim_index.size_s(); ++i)
+			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);}
+	//! \~english Compare operator with array `m`.
-	bool operator !=(const PIMap<Key, T> & t) const {return (pim_content != t.pim_content || pim_index != t.pim_index);}
+	//! \~russian Оператор сравнения с массивом `m`.
-	bool contains(const Key & key) const {bool f(false); _find(key, f); return f;}
+	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;}
+	//! \~english Tests if element with key `key` exists in the array.
-	PIMap<Key, T> & remove(const Key & key) {return removeOne(key);}
+	//! \~russian Проверяет наличие элемента с ключом `key` в массиве.
-	PIMap<Key, T> & erase(const Key & key) {return removeOne(key);}
+	inline bool contains(const Key & key) const {
-	PIMap<Key, T> & clear() {pim_content.clear(); pim_index.clear(); return *this;}
+		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;
+			}
+		}
+		return *this;
+	}
+
+	//! \~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);
+		const ssize_t i = _find(key, f);
-		//piCout << "insert key=" << key << "found=" << f << "index=" << i << "value=" << value;
 		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);
+		const ssize_t i = _find(key, f);
-		//piCout << "insert key=" << key << "found=" << f << "index=" << i << "value=" << value;
 		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;}
+	//! \~english Inserts value `pair` in the array.
-	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_;}
+	//! \~russian Вставляет пару `pair` в массив.
-	PIVector<Key> keys() const {
+	//! \~\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() {
+	//! \~english Execute function `void f(const Key & key, const T & value)` for every element in array.
-		piCout << "PIMap" << size() << "entries" << PICoutManipulators::NewLine << "content:";
+	//! \~russian Выполняет функцию `void f(const Key & key, const T & value)` для каждого элемента массива.
-		for (size_t i = 0; i < pim_content.size(); ++i)
+	inline void forEach(std::function<void(const Key & key, const T & value)> f) const {
-			piCout << PICoutManipulators::Tab << i << ":" << pim_content[i];
+		for (int i = 0; i < pim_index.size_s(); ++i) {
-		piCout << "index:";
+			const auto & mi(pim_index[i]);
-		for (size_t i = 0; i < pim_index.size(); ++i)
+			f(mi.key, pim_content[mi.index]);
-			piCout << PICoutManipulators::Tab << i << ":" << pim_index[i].key << "->" << pim_index[i].index;
+		}
+	}
+
+	//! \~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;
 	}
 
 protected:
 	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; }
@@ -295,130 +621,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 {
+	template<typename P, typename Key1, typename T1>
-		ssize_t mid;
+	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);
+
+	PIVector<T> pim_content;
+	PIDeque<MapIndex> pim_index;
+
+private:
+	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;
+			if (key > pim_index[mid].key)
-			else if (key < pim_index[mid].key) last = mid - 1;
+				first = mid + 1;
-			else {found = true; return mid;}
+			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;
+	inline void _remove(ssize_t index) {
-		size_t ci = pim_index[index].index, bi = pim_index.size() - 1;
+		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]);
-	}
-	Key & _key(ssize_t index) {return pim_index[index].key;}
-	T & _value(ssize_t index) {return pim_content[pim_index[index].index];}
 
-	PIVector<T> pim_content;
+	inline const value_type _pair(ssize_t index) const {
-	PIDeque<MapIndex> pim_index;
+		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]);
+	}
+
+	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]; }
 };
 
 
+//! \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) {
+	inline PIMapIteratorConst(const PIMap<Key, T> & map): m(map), pos(-1) {}
-		if (rev) pos = m.size_s();
+
-	}
+	//! \~english Returns current key.
-	const Key & key() const {return const_cast<MapType & >(m)._key(pos);}
+	//! \~russian Возвращает ключ текущего элемента.
-	const T & value() const {return const_cast<MapType & >(m)._value(pos);}
+	//! \~\sa \a value()
-	T & valueRef() const {return const_cast<MapType & >(m)._value(pos);}
+	inline const Key & key() const { return m._key(pos); }
-	inline bool hasNext() const {
+
-		if (rev) {
+	//! \~english Returns current value.
-			return pos > 0;
+	//! \~russian Возвращает значение текущего элемента.
-		} else {
+	//! \~\sa \a key()
-			return pos < (m.size_s() - 1);
+	inline const T & value() const { return m._value(pos); }
-		}
+
-		return false;
+
-	}
+	//! \~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;
+
-	}
+	//! \~english Reset iterator to initial position.
-	inline void reset() {
+	//! \~russian Переходит на начало.
-		if (rev) {
+	//! \~\sa \a next()
-			pos = m.size_s();
+	inline void reset() { pos = -1; }
-		} else {
+
-			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)
+		if (!first) s << ", ";
-			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)
+		if (!first) s << ", ";
-			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

@@ -44,25 +44,28 @@
 //! \~english Class template that provides a way to store two heterogeneous objects as a single unit.
 //! \~russian Класс, который позволяет хранить два разнородных объекта как единое целое.
 //! \~\}
-//! \details
-//! \~english
-//! \~russian
 //! \~\sa \a PIMap
 template<typename Type0, typename Type1>
 class PIPair {
 public:
-
 	//! \~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).
-	PIPair(std::tuple<Type0, Type1> 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) {
@@ -114,31 +117,20 @@ inline std::ostream & operator <<(std::ostream & s, const PIPair<Type0, Type1> &
 template<typename Type0, typename Type1>
 inline PICout operator<<(PICout s, const PIPair<Type0, Type1> & v) {
 	s.space();
-	s.setControl(0, true);
+	s.saveAndSetControls(0);
 	s << "(" << v.first << ", " << v.second << ")";
-	s.restoreControl();
+	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) {
+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 piqueue.h
+//! \addtogroup Containers
- * \brief Queue container
+//! \{
- * 
+//! \file piqueue.h
- * This file declare PIQueue
+//! \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;}
+	//! \~english Puts an element on the queue.
-	PIDeque<T> & enqueue(T && v) {PIDeque<T>::push_front(std::move(v)); return *this;}
+	//! \~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;
+	//! \~english Tail element of the queue.
-		v.reserve(PIDeque<T>::size());
+	//! \~russian Хвостовой (нижний) элемент очереди.
-		for (uint i = 0; i < PIDeque<T>::size(); ++i)
+	//! \~\details
-			v.push_back(PIDeque<T>::at(i));
+	//! \~english Returns a reference to the tail element of the queue.
-		return v;
+	//! 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