--- parser3/src/include/pa_string.h 2026/01/06 13:27:59 1.239 +++ parser3/src/include/pa_string.h 2026/10/13 20:02:00 1.244 @@ -1,14 +1,14 @@ /** @file Parser: string class decl. - Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) Authors: Konstantin Morshnev , Alexandr Petrosian */ #ifndef PA_STRING_H #define PA_STRING_H -#define IDENT_PA_STRING_H "$Id: pa_string.h,v 1.239 2026/01/06 13:27:59 moko Exp $" +#define IDENT_PA_STRING_H "$Id: pa_string.h,v 1.244 2026/10/13 20:02:00 moko Exp $" // includes #include "pa_types.h" @@ -92,7 +92,7 @@ class String: public PA_Object { public: /** piece is tainted or not. the lang to use when detaint - remember to change String_Untaint_lang_name @ untaint.C along + remember to change Name2lang_hash @ untaint.C along WARNING WARNING WARNING WARNING WARNING WARNING @@ -135,6 +135,11 @@ public: L_OPTIMIZE_BIT = 0x80 ///< flag, requiring cstr whitespace optimization }; + /// throws an exception for an unknown name + static Language name2lang(const String& name); + /// 0 if there is none + static const char* lang2name(Language lang); + enum Trim_kind { TRIM_BOTH, TRIM_START, @@ -483,6 +488,12 @@ public: return CORD_chr(body, offset, c); } + size_t strrchr(char c, size_t right) const { + if(right>=length()) // CORD_rchr does not check that [and ABORT's in that case] + return STRING_NOT_FOUND; + + return CORD_rchr(body, right, c); + } size_t strrpbrk(const char* chars, size_t left, size_t right) const; @@ -656,6 +667,8 @@ public: size_t pos(const Body substr, size_t this_offset, Language lang) const; size_t pos(const String& substr, size_t this_offset, Language lang) const; size_t pos(Charset& charset, const String& substr, size_t this_offset=0, Language lang=L_UNSPECIFIED) const; + /// true if the characters from offset to offset+length are of lang or a cleaner one + bool check_lang(Language lang, size_t offset, size_t length) const { return langs.check_lang(lang, offset, length); } size_t strrpbrk(const char* chars, size_t left=0) const { return (length()) ? body.strrpbrk(chars, left, length()-1) : STRING_NOT_FOUND; @@ -663,6 +676,12 @@ public: size_t strrpbrk(const char* chars, size_t left, size_t right) const { return body.strrpbrk(chars, left, right); } + size_t strrchr(char c) const { + return (length()) ? body.strrchr(c, length()-1) : STRING_NOT_FOUND; + } + size_t strrchr(char c, size_t right) const { + return body.strrchr(c, right); + } size_t rskipchars(const char* chars, size_t left=0) const { return (length()) ? body.rskipchars(chars, left, length()-1) : STRING_NOT_FOUND; @@ -678,7 +697,7 @@ public: /** @return table of found items, if any. - table format is defined and fixed[can be used by others]: + table format is defined and fixed[can be used by others]: @verbatim prematch/match/postmatch/1/2/3/... @endverbatim @@ -689,13 +708,17 @@ public: CC_UPPER, CC_LOWER }; + /// keeps the chars languages String& change_case(Charset& source_charset, Change_case_kind kind) const; + /// keeps the chars languages + String& change_char(char from, char to) const; const String& replace(const Dictionary& dict) const; const String& trim(Trim_kind kind=TRIM_BOTH, const char* chars=0, Charset* source_charset=0) const; double as_double() const { return pa_atod(cstr(), this); } int as_int() const { return pa_atoi(cstr(), 0, this); } - bool as_bool() const { return as_int()!=0; } + pa_wint as_wint() const { return pa_atowi(cstr(), 0, this); } + bool as_bool() const { return as_wint()!=0; } const String& escape(Charset& source_charset) const; private: //disabled