3.10.2013 - PIPeer release, PIConsole now can work as server and remote client. Remote console test program in directory "remote_console"

pistring.h

@@ -86,7 +86,7 @@ public:
 	PIString(const int len, const PIChar & c) {reserve(256); piMonitor.strings++; piMonitor.containers--; for (int i = 0; i < len; ++i) push_back(c);}
 
 	//! Contructs string from other string "str"
-	PIString(const PIString & str) {reserve(256); piMonitor.strings++; piMonitor.containers--; *this += str;}
+	PIString(const PIString & str) {reserve(256); piMonitor.strings++; piMonitor.containers--; uint len = str.size(); for (uint i = 0; i < len; ++i) push_back(str[i]);}
 
 	~PIString() {piMonitor.strings--; piMonitor.containers++;}
 
@@ -340,12 +340,40 @@ public:
 	 * \details Example: \snippet pistring.cpp PIString::reversed
 	 * \sa \a reverse() */
 	PIString   reversed() const {PIString str(*this); str.reverse(); return str;}
+	
+	
+	/*! \brief Take a symbol from the begin of this string and return it
+	 * \details Example: \snippet pistring.cpp PIString::takeSymbol
+	 * \sa \a \a takeWord(), takeLine(), \a takeNumber(), \a takeRange() */
+	PIString takeSymbol();
+	
+	/*! \brief Take a word from the begin of this string and return it
+	 * \details Example: \snippet pistring.cpp PIString::takeWord
+	 * \sa \a takeSymbol(), \a takeLine(), \a takeNumber(), \a takeRange() */
+	PIString takeWord();
+	
+	/*! \brief Take a line from the begin of this string and return it
+	 * \details Example: \snippet pistring.cpp PIString::takeLine
+	 * \sa \a takeSymbol(), \a takeWord(), \a takeNumber(), \a takeRange() */
+	PIString takeLine();
+	
+	/*! \brief Take a number with C-format from the begin of this string and return it
+	 * \details Example: \snippet pistring.cpp PIString::takeNumber
+	 * \sa \a takeSymbol(), \a takeWord(), \a takeLine(), \a takeRange() */
+	PIString takeNumber();
+	
+	/*! \brief Take a range between "start" and "end" symbols from the begin of this
+	 * string and return it.
+	 * \details "Shield" symbol prevent analysis of the next symbol.
+	 * Example: \snippet pistring.cpp PIString::takeRange
+	 * \sa \a takeSymbol(), \a takeWord(), \a takeLine(), \a takeNumber() */
+	PIString takeRange(const PIChar & start, const PIChar & end, const PIChar & shield = '\\');
 
 	//const char * data() {return convertToStd().c_str();}
 	
 	
 	/*! \brief Return real bytes count of this string
-	 * \details It`s equivalent length os char sequence
+	 * \details It`s equivalent length of char sequence
 	 * returned by function \a data() \n
 	 * Example: \snippet pistring.cpp PIString::lengthAscii
 	 * \sa \a data() */
@@ -353,7 +381,7 @@ public:
 	
 	/*! \brief Return \c char * representation of this string
 	 * \details This function fill buffer by sequence
-	 * of chars. Minimum length of this buffer is count 
+	 * of chars. Minimum length of this buffer is count
 	 * of symbols. Returned \c char * is valid until next
 	 * execution of this function.\n
 	 * Example: \snippet pistring.cpp PIString::data
@@ -645,10 +673,10 @@ inline PICout operator <<(PICout s, const PIString & v) {s.space(); s.quote(); s
 
 
 //! \relatesalso PIString \relatesalso PIByteArray \brief Output operator to PIByteArray
-inline PIByteArray & operator <<(PIByteArray & s, const PIString & v) {s << v.size_s(); for (int i = 0; i < v.length(); ++i) s << v[i]; return s;}
+inline PIByteArray & operator <<(PIByteArray & s, const PIString & v) {int l = v.lengthAscii(); s << l; if (l <= 0) return s; int os = s.size_s(); s.enlarge(l); memcpy(s.data(os), v.data(), l); return s;}
 
 //! \relatesalso PIString \relatesalso PIByteArray \brief Input operator from PIByteArray
-inline PIByteArray & operator >>(PIByteArray & s, PIString & v) {int sz; s >> sz; v.resize(sz); for (int i = 0; i < sz; ++i) s >> v[i]; return s;}
+inline PIByteArray & operator >>(PIByteArray & s, PIString & v) {int l; s >> l; if (l <= 0) return s; v = PIString((const char * )s.data(), l); s.remove(0, l); return s;}
 
 
 //! \relatesalso PIString \brief Return concatenated string
@@ -728,6 +756,14 @@ public:
 
 };
 
+
+//! \relatesalso PIStringList \relatesalso PIByteArray \brief Output operator to PIByteArray
+inline PIByteArray & operator <<(PIByteArray & s, const PIStringList & v) {s << v.size_s(); for (int i = 0; i < v.size_s(); ++i) s << v[i]; return s;}
+
+//! \relatesalso PIStringList \relatesalso PIByteArray \brief Input operator from PIByteArray
+inline PIByteArray & operator >>(PIByteArray & s, PIStringList & v) {int sz; s >> sz; v.resize(sz); for (int i = 0; i < sz; ++i) s >> v[i]; return s;}
+
+
 //! \relatesalso PIStringList \brief Output operator to std::ostream (cout)
 inline std::ostream & operator <<(std::ostream & s, const PIStringList & v) {s << "{"; for (uint i = 0; i < v.size(); ++i) {s << '\"' << v[i] << '\"'; if (i < v.size() - 1) s << ", ";} s << "}"; return s;}