diff options
author | agorodilov <agorodilov@yandex-team.ru> | 2022-02-10 16:47:09 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:09 +0300 |
commit | 7a4979e6211c3e78c7f9041d4a9e5d3405343c36 (patch) | |
tree | 9e9943579e5a14679af7cd2cda3c36d8c0b775d3 /util | |
parent | 676340c42e269f3070f194d160f42a83a10568d4 (diff) | |
download | ydb-7a4979e6211c3e78c7f9041d4a9e5d3405343c36.tar.gz |
Restoring authorship annotation for <agorodilov@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'util')
106 files changed, 921 insertions, 921 deletions
diff --git a/util/charset/benchmark/utf8_to_wide/main.cpp b/util/charset/benchmark/utf8_to_wide/main.cpp index 09fa567fe5..3392b65bb2 100644 --- a/util/charset/benchmark/utf8_to_wide/main.cpp +++ b/util/charset/benchmark/utf8_to_wide/main.cpp @@ -1,24 +1,24 @@ #include <library/cpp/testing/benchmark/bench.h> - -#include <util/random/fast.h> -#include <util/random/random.h> -#include <util/generic/singleton.h> -#include <util/generic/vector.h> -#include <util/charset/wide.h> - -#include <cmath> - -namespace { - template <size_t N> + +#include <util/random/fast.h> +#include <util/random/random.h> +#include <util/generic/singleton.h> +#include <util/generic/vector.h> +#include <util/charset/wide.h> + +#include <cmath> + +namespace { + template <size_t N> struct TRandomAsciiString: public TVector<char> { - inline TRandomAsciiString() { + inline TRandomAsciiString() { reserve(N); - for (size_t i = 0; i < N; ++i) { - push_back(RandomNumber<char>(127)); - } - } - }; - + for (size_t i = 0; i < N; ++i) { + push_back(RandomNumber<char>(127)); + } + } + }; + template <size_t N> struct TRandomRuString: public TVector<char> { inline TRandomRuString() { @@ -33,18 +33,18 @@ namespace { } }; - using RAS1 = TRandomAsciiString<1>; - using RAS10 = TRandomAsciiString<10>; - using RAS50 = TRandomAsciiString<50>; - using RAS1000 = TRandomAsciiString<1000>; - using RAS1000000 = TRandomAsciiString<1000000>; + using RAS1 = TRandomAsciiString<1>; + using RAS10 = TRandomAsciiString<10>; + using RAS50 = TRandomAsciiString<50>; + using RAS1000 = TRandomAsciiString<1000>; + using RAS1000000 = TRandomAsciiString<1000000>; using RRS1 = TRandomRuString<1>; using RRS10 = TRandomRuString<10>; using RRS1000 = TRandomRuString<1000>; using RRS1000000 = TRandomRuString<1000000>; -} - +} + #ifdef _sse2_ #define IS_ASCII_BENCHMARK(length) \ Y_CPU_BENCHMARK(IsStringASCII##length, iface) { \ @@ -80,7 +80,7 @@ namespace { } \ } #endif - + IS_ASCII_BENCHMARK(1); IS_ASCII_BENCHMARK(10); IS_ASCII_BENCHMARK(50); diff --git a/util/charset/benchmark/utf8_to_wide/ya.make b/util/charset/benchmark/utf8_to_wide/ya.make index 4631fd7c41..2fb1bbcf29 100644 --- a/util/charset/benchmark/utf8_to_wide/ya.make +++ b/util/charset/benchmark/utf8_to_wide/ya.make @@ -1,9 +1,9 @@ Y_BENCHMARK() - -OWNER(agorodilov) - -SRCS( - main.cpp -) - -END() + +OWNER(agorodilov) + +SRCS( + main.cpp +) + +END() diff --git a/util/charset/ut/utf8/test1.txt b/util/charset/ut/utf8/test1.txt index 47a0c36486..15aa804424 100644 --- a/util/charset/ut/utf8/test1.txt +++ b/util/charset/ut/utf8/test1.txt @@ -1,505 +1,505 @@ -Sentences that contain all letters commonly used in a language --------------------------------------------------------------- - -Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/> -- 2001-09-02 - -This file is UTF-8 encoded. - - -Danish (da) ---------- - - Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen - Wolther spillede på xylofon. - (= Quiz contestants were eating strawbery with cream while Wolther - the circus clown played on xylophone.) - -German (de) ------------ - - Falsches Üben von Xylophonmusik quält jeden größeren Zwerg - (= Wrongful practicing of xylophone music tortures every larger dwarf) - - Zwölf Boxkämpfer jagten Eva quer über den Sylter Deich - (= Twelve boxing fighters hunted Eva across the dike of Sylt) - - Heizölrückstoßabdämpfung - (= fuel oil recoil absorber) - (jqvwxy missing, but all non-ASCII letters in one word) - -English (en) ------------- - - The quick brown fox jumps over the lazy dog - -Spanish (es) ------------- - - El pingüino Wenceslao hizo kilómetros bajo exhaustiva lluvia y - frío, añoraba a su querido cachorro. - (Contains every letter and every accent, but not every combination - of vowel + acute.) - -French (fr) ------------ - - Portez ce vieux whisky au juge blond qui fume sur son île intérieure, à - côté de l'alcôve ovoïde, où les bûches se consument dans l'âtre, ce - qui lui permet de penser à la cænogenèse de l'être dont il est question - dans la cause ambiguë entendue à Moÿ, dans un capharnaüm qui, - pense-t-il, diminue çà et là la qualité de son œuvre. - - l'île exiguë - Où l'obèse jury mûr - Fête l'haï volapük, - Âne ex aéquo au whist, - Ôtez ce vœu déçu. - - Le cœur déçu mais l'âme plutôt naïve, Louÿs rêva de crapaüter en - canoë au delà des îles, près du mälström où brûlent les novæ. - -Irish Gaelic (ga) ------------------ - - D'fhuascail Íosa, Úrmhac na hÓighe Beannaithe, pór Éava agus Ádhaimh - -Hungarian (hu) --------------- - - Árvíztűrő tükörfúrógép - (= flood-proof mirror-drilling machine, only all non-ASCII letters) - -Icelandic (is) --------------- - - Kæmi ný öxi hér ykist þjófum nú bæði víl og ádrepa - - Sævör grét áðan því úlpan var ónýt - (some ASCII letters missing) - -Japanese (jp) -------------- - - Hiragana: (Iroha) - - いろはにほへとちりぬるを - わかよたれそつねならむ - うゐのおくやまけふこえて - あさきゆめみしゑひもせす - - Katakana: - - イロハニホヘト チリヌルヲ ワカヨタレソ ツネナラム - ウヰノオクヤマ ケフコエテ アサキユメミシ ヱヒモセスン - -Hebrew (iw) ------------ - - ? דג סקרן שט בים מאוכזב ולפתע מצא לו חברה איך הקליטה - -Polish (pl) ------------ - - Pchnąć w tę łódź jeża lub ośm skrzyń fig - (= To push a hedgehog or eight bins of figs in this boat) - -Russian (ru) ------------- - - В чащах юга жил бы цитрус? Да, но фальшивый экземпляр! - (= Would a citrus live in the bushes of south? Yes, but only a fake one!) - -Thai (th) ---------- - - [--------------------------|------------------------] - ๏ เป็นมนุษย์สุดประเสริฐเลิศคุณค่า กว่าบรรดาฝูงสัตว์เดรัจฉาน - จงฝ่าฟันพัฒนาวิชาการ อย่าล้างผลาญฤๅเข่นฆ่าบีฑาใคร - ไม่ถือโทษโกรธแช่งซัดฮึดฮัดด่า หัดอภัยเหมือนกีฬาอัชฌาสัย - ปฏิบัติประพฤติกฎกำหนดใจ พูดจาให้จ๊ะๆ จ๋าๆ น่าฟังเอย ฯ - - [The copyright for the Thai example is owned by The Computer - Association of Thailand under the Royal Patronage of His Majesty the - King.] - -Please let me know if you find others! Special thanks to the people -from all over the world who contributed these sentences. -? *Unicode Transcriptions* Notes <#Notes> - -Glyphs <http://www.macchiato.com/unicode/show.html> | Samples -<http://www.macchiato.com/unicode/Unicode_transcriptions.html> | Charts -<http://www.macchiato.com/unicode/charts.html> | UTF -<http://www.macchiato.com/unicode/convert.html> | Forms -<http://www-4.ibm.com/software/developer/library/utfencodingforms/> | -Home <http://www.macchiato.com>. -<http://member.linkexchange.com/cgi-bin/fc/fastcounter-login?750641> - -Name Text Image -Arabic (Arabic) يونِكود ? -Arabic (Persian) یونیکُد / ?/ -Armenian Յունիկօդ -Bengali য়ূনিকোড -Bopomofo ㄊㄨㄥ˅ ㄧˋ ㄇㄚ˅ -ㄨㄢˋ ㄍㄨㄛˊ ㄇㄚ˅ -Braille -Buhid -Canadian Aboriginal ᔫᗂᑰᑦ -Cherokee ᏳᏂᎪᏛ -Cypriot -Cyrillic (Russian) Юникод ? -Deseret (English) ??????? -Devanagari (Hindi) यूनिकोड ? -Ethiopic ዩኒኮድ -Georgian უნიკოდი ? -Gothic -Greek Γιούνικοντ -Gujarati યૂનિકોડ -Gurmukhi ਯੂਨਿਕੋਡ -Han (Chinese) 统一码 ? -統一碼 ? -万国码 ? -萬國碼 ? -Hangul 유니코드 -Hanunoo -Hebrew יוניקוד -Hebrew (pointed) יוּנִיקוׁד -Hebrew (Yiddish) יוניקאָד ? -Hiragana (Japanese) ゆにこおど -Katakana (Japanese) ユニコード ? -Kannada ಯೂನಿಕೋಡ್ -Khmer យូនីគោដ -Lao -Latin Unicode Unicode -Latin (IPA <#English_Pronunciation>) ˈjunɪˌkoːd ? -Latin (Am. Dict. <#American_Dictionary>) Ūnĭcōde̽ ? -Limbu -Linear B -Malayalam യൂനികോഡ് -Mongolian -Myanmar -Ogham ᚔᚒᚅᚔᚉᚑᚇ / / -Old Italic -Oriya ୟୂନିକୋଡ -Osmanya -Runic (Anglo-Saxon) ᛡᚢᚾᛁᚳᚩᛞ -Shavian -Sinhala යණනිකෞද් -Syriac ܝܘܢܝܩܘܕ -Tagbanwa -Tagalog -Tai Le -Tamil யூனிகோட் -Telugu యూనికోడ్ -Thaana -Thai ยูนืโคด -Tibetan (Dzongkha) ཨུ་ནི་ཀོཌྲ། -Ugaritic -Yi - - - Notes: - -There are different ways to transcribe the word “Unicode”, depending on -the language and script. In some cases there is only one language that -customarily uses a given script; in others there are many languages. The -goal here is at a minimum to collect at least one transcription for each -script in a language customarily written in that script, with more -languages if possible. If the transcription is the same for multiple -languages in a script, then a single representative language is used. - -Still missing are transcriptions for the items above in RED (in at least -one language). I would appreciate any other transcriptions, or -corrections for the ones listed here. Send to mark3@macchiato.com -<mailto:mark3@macchiato.com>, using the directions below: - - * *Supplying Missing Items* - o Most Latin-script languages will follow the spelling, and - change the pronunciation. For any that would not, it would - be good to have the alternate spelling. - o For non-Latin scripts the goal is to match the English - pronunciation — /*not*/ spelling. Above is the IPA <#IPA> - (in phonemic transcription) that should be matched as - closely as possible (without sounding affected in the target - language) - o Text would be best in either the UTF-8 text, or the code - points in hex HTML. E.g. either of the following: - + "Юникод" - + "Юникод" - + Note: for / supplementary characters/ - <http://www.unicode.org/glossary/#supplementary_character>, - there should be one hex number per code point, not two - surrogates - <http://www.unicode.org/glossary/#surrogate_code_point>: - # 𐀀 /*not*/ �&xDC00; - o If you have a good font, I'd also appreciate a GIF. It - should be *96 x 24* bits, with the text centered, in black - on white (plus grays if smoothed). - * *Other Comments* - o Because some browsers won't handle the text, both text and - GIF image are supplied. If you can’t read the text columns, - see Display Problems - <http://www.unicode.org/help/display_problems.html>. - o The Chinese versions (inc. Bopomofo) are translations, not - transcriptions, since "transcription in Chinese is pretty - lame" [J. Becker]. - o There are other "translations" of Unicode that may be in - use, such as the Vietnamese "Thống Nhất Mã". - o For sample pages in different languages on the Unicode site, - see What is Unicode? - <http://www.unicode.org/unicode/standard/WhatIsUnicode.html> - o Americans are not generally used to IPA, and find a variety - of different systems in their dictionaries. This one leaves - the base letters as they are, and uses diacritics for - pronunciation. - * *Etymology of /Unicode/* - o Coined by J. Becker. Not related to previous usages, such as: - + A telegraphic code in which one word or set of letters - represents a sentence or phrase; a telegram or message - in this. (late 19th century, OED) - o According to my references, the prefix "uni" is directly - from Latin while the word "code" is through French. - o The original Indo-European apparently would have been - *oino-kau-do ("one strike give"): *kau apparently being - related to such English words as: hew, haggle, hoe, hag, - hay, hack, caudad, caudal, caudate, caudex, coda, codex, - codicil, coward, incus, and Kovač (personal name: "smith"). - + I will leave the exact derivations to the exegetes, - but I like the association with "haggle" myself. - * *Contributions* - o This draws on contributions or comments from: - + Dixon Au - + Joe Becker - + Maurice Bauhahn - + Abel Cheung - + Peter Constable - + Michael Everson - + Christopher John Fynn - + Michael Kaplan - + George Kiraz - + Abdul Malik - + Siva Nataraja - + Roozbeh Pournader - + Jonathan Rosenne - + Jungshik Shin - ------------------------------------------------------------------------- - - -Terms of Use <http://www.macchiato.com/terms_of_use.html>. Last updated: -MED - 04/20/2003 15:30:33. -<http://member.linkexchange.com/cgi-bin/fc/fastcounter-login?750641> - - - - -UTF-8 encoded sample plain-text file -‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ - -Markus Kuhn [ˈmaʳkʊs kuːn] <http://www.cl.cam.ac.uk/~mgk25/> — 2002-07-25 - - -The ASCII compatible UTF-8 encoding used in this plain-text file -is defined in Unicode, ISO 10646-1, and RFC 2279. - - -Using Unicode/UTF-8, you can write in emails and source code things such as - -Mathematics and sciences: - - ∮ E⋅da = Q, n → ∞, ∑ f(i) = ∏ g(i), ⎧⎡⎛┌─────┐⎞⎤⎫ - ⎪⎢⎜│a²+b³ ⎟⎥⎪ - ∀x∈ℝ: ⌈x⌉ = −⌊−x⌋, α ∧ ¬β = ¬(¬α ∨ β), ⎪⎢⎜│───── ⎟⎥⎪ - ⎪⎢⎜⎷ c₈ ⎟⎥⎪ - ℕ ⊆ ℕ₀ ⊂ ℤ ⊂ ℚ ⊂ ℝ ⊂ ℂ, ⎨⎢⎜ ⎟⎥⎬ - ⎪⎢⎜ ∞ ⎟⎥⎪ - ⊥ < a ≠ b ≡ c ≤ d ≪ ⊤ ⇒ (⟦A⟧ ⇔ ⟪B⟫), ⎪⎢⎜ ⎲ ⎟⎥⎪ - ⎪⎢⎜ ⎳aⁱ-bⁱ⎟⎥⎪ - 2H₂ + O₂ ⇌ 2H₂O, R = 4.7 kΩ, ⌀ 200 mm ⎩⎣⎝i=1 ⎠⎦⎭ - -Linguistics and dictionaries: - - ði ıntəˈnæʃənəl fəˈnɛtık əsoʊsiˈeıʃn - Y [ˈʏpsilɔn], Yen [jɛn], Yoga [ˈjoːgɑ] - -APL: - - ((V⍳V)=⍳⍴V)/V←,V ⌷←⍳→⍴∆∇⊃‾⍎⍕⌈ - -Nicer typography in plain text files: - - ╔══════════════════════════════════════════╗ - ║ ║ - ║ • ‘single’ and “double” quotes ║ - ║ ║ - ║ • Curly apostrophes: “We’ve been here” ║ - ║ ║ - ║ • Latin-1 apostrophe and accents: '´` ║ - ║ ║ - ║ • ‚deutsche‘ „Anführungszeichen“ ║ - ║ ║ - ║ • †, ‡, ‰, •, 3–4, —, −5/+5, ™, … ║ - ║ ║ - ║ • ASCII safety test: 1lI|, 0OD, 8B ║ - ║ ╭─────────╮ ║ - ║ • the euro symbol: │ 14.95 € │ ║ - ║ ╰─────────╯ ║ - ╚══════════════════════════════════════════╝ - -Combining characters: - - STARGΛ̊TE SG-1, a = v̇ = r̈, a⃑ ⊥ b⃑ - -Greek (in Polytonic): - - The Greek anthem: - - Σὲ γνωρίζω ἀπὸ τὴν κόψη - τοῦ σπαθιοῦ τὴν τρομερή, - σὲ γνωρίζω ἀπὸ τὴν ὄψη - ποὺ μὲ βία μετράει τὴ γῆ. - - ᾿Απ᾿ τὰ κόκκαλα βγαλμένη - τῶν ῾Ελλήνων τὰ ἱερά - καὶ σὰν πρῶτα ἀνδρειωμένη - χαῖρε, ὦ χαῖρε, ᾿Ελευθεριά! - - From a speech of Demosthenes in the 4th century BC: - - Οὐχὶ ταὐτὰ παρίσταταί μοι γιγνώσκειν, ὦ ἄνδρες ᾿Αθηναῖοι, - ὅταν τ᾿ εἰς τὰ πράγματα ἀποβλέψω καὶ ὅταν πρὸς τοὺς - λόγους οὓς ἀκούω· τοὺς μὲν γὰρ λόγους περὶ τοῦ - τιμωρήσασθαι Φίλιππον ὁρῶ γιγνομένους, τὰ δὲ πράγματ᾿ - εἰς τοῦτο προήκοντα, ὥσθ᾿ ὅπως μὴ πεισόμεθ᾿ αὐτοὶ - πρότερον κακῶς σκέψασθαι δέον. οὐδέν οὖν ἄλλο μοι δοκοῦσιν - οἱ τὰ τοιαῦτα λέγοντες ἢ τὴν ὑπόθεσιν, περὶ ἧς βουλεύεσθαι, - οὐχὶ τὴν οὖσαν παριστάντες ὑμῖν ἁμαρτάνειν. ἐγὼ δέ, ὅτι μέν - ποτ᾿ ἐξῆν τῇ πόλει καὶ τὰ αὑτῆς ἔχειν ἀσφαλῶς καὶ Φίλιππον - τιμωρήσασθαι, καὶ μάλ᾿ ἀκριβῶς οἶδα· ἐπ᾿ ἐμοῦ γάρ, οὐ πάλαι - γέγονεν ταῦτ᾿ ἀμφότερα· νῦν μέντοι πέπεισμαι τοῦθ᾿ ἱκανὸν - προλαβεῖν ἡμῖν εἶναι τὴν πρώτην, ὅπως τοὺς συμμάχους - σώσομεν. ἐὰν γὰρ τοῦτο βεβαίως ὑπάρξῃ, τότε καὶ περὶ τοῦ - τίνα τιμωρήσεταί τις καὶ ὃν τρόπον ἐξέσται σκοπεῖν· πρὶν δὲ - τὴν ἀρχὴν ὀρθῶς ὑποθέσθαι, μάταιον ἡγοῦμαι περὶ τῆς - τελευτῆς ὁντινοῦν ποιεῖσθαι λόγον. - - Δημοσθένους, Γ´ ᾿Ολυνθιακὸς - -Georgian: - - From a Unicode conference invitation: - - გთხოვთ ახლავე გაიაროთ რეგისტრაცია Unicode-ის მეათე საერთაშორისო - კონფერენციაზე დასასწრებად, რომელიც გაიმართება 10-12 მარტს, - ქ. მაინცში, გერმანიაში. კონფერენცია შეჰკრებს ერთად მსოფლიოს - ექსპერტებს ისეთ დარგებში როგორიცაა ინტერნეტი და Unicode-ი, - ინტერნაციონალიზაცია და ლოკალიზაცია, Unicode-ის გამოყენება - ოპერაციულ სისტემებსა, და გამოყენებით პროგრამებში, შრიფტებში, - ტექსტების დამუშავებასა და მრავალენოვან კომპიუტერულ სისტემებში. - -Russian: - - From a Unicode conference invitation: - - Зарегистрируйтесь сейчас на Десятую Международную Конференцию по - Unicode, которая состоится 10-12 марта 1997 года в Майнце в Германии. - Конференция соберет широкий круг экспертов по вопросам глобального - Интернета и Unicode, локализации и интернационализации, воплощению и - применению Unicode в различных операционных системах и программных - приложениях, шрифтах, верстке и многоязычных компьютерных системах. - -Thai (UCS Level 2): - - Excerpt from a poetry on The Romance of The Three Kingdoms (a Chinese - classic 'San Gua'): - - [----------------------------|------------------------] - ๏ แผ่นดินฮั่นเสื่อมโทรมแสนสังเวช พระปกเกศกองบู๊กู้ขึ้นใหม่ - สิบสองกษัตริย์ก่อนหน้าแลถัดไป สององค์ไซร้โง่เขลาเบาปัญญา - ทรงนับถือขันทีเป็นที่พึ่ง บ้านเมืองจึงวิปริตเป็นนักหนา - โฮจิ๋นเรียกทัพทั่วหัวเมืองมา หมายจะฆ่ามดชั่วตัวสำคัญ - เหมือนขับไสไล่เสือจากเคหา รับหมาป่าเข้ามาเลยอาสัญ - ฝ่ายอ้องอุ้นยุแยกให้แตกกัน ใช้สาวนั้นเป็นชนวนชื่นชวนใจ - พลันลิฉุยกุยกีกลับก่อเหตุ ช่างอาเพศจริงหนาฟ้าร้องไห้ - ต้องรบราฆ่าฟันจนบรรลัย ฤๅหาใครค้ำชูกู้บรรลังก์ ฯ - - (The above is a two-column text. If combining characters are handled - correctly, the lines of the second column should be aligned with the - | character above.) - -Ethiopian: - - Proverbs in the Amharic language: - - ሰማይ አይታረስ ንጉሥ አይከሰስ። - ብላ ካለኝ እንደአባቴ በቆመጠኝ። - ጌጥ ያለቤቱ ቁምጥና ነው። - ደሀ በሕልሙ ቅቤ ባይጠጣ ንጣት በገደለው። - የአፍ ወለምታ በቅቤ አይታሽም። - አይጥ በበላ ዳዋ ተመታ። - ሲተረጉሙ ይደረግሙ። - ቀስ በቀስ፥ ዕንቁላል በእግሩ ይሄዳል። - ድር ቢያብር አንበሳ ያስር። - ሰው እንደቤቱ እንጅ እንደ ጉረቤቱ አይተዳደርም። - እግዜር የከፈተውን ጉሮሮ ሳይዘጋው አይድርም። - የጎረቤት ሌባ፥ ቢያዩት ይስቅ ባያዩት ያጠልቅ። - ሥራ ከመፍታት ልጄን ላፋታት። - ዓባይ ማደሪያ የለው፥ ግንድ ይዞ ይዞራል። - የእስላም አገሩ መካ የአሞራ አገሩ ዋርካ። - ተንጋሎ ቢተፉ ተመልሶ ባፉ። - ወዳጅህ ማር ቢሆን ጨርስህ አትላሰው። - እግርህን በፍራሽህ ልክ ዘርጋ። - -Runes: - - ᚻᛖ ᚳᚹᚫᚦ ᚦᚫᛏ ᚻᛖ ᛒᚢᛞᛖ ᚩᚾ ᚦᚫᛗ ᛚᚪᚾᛞᛖ ᚾᚩᚱᚦᚹᛖᚪᚱᛞᚢᛗ ᚹᛁᚦ ᚦᚪ ᚹᛖᛥᚫ - - (Old English, which transcribed into Latin reads 'He cwaeth that he - bude thaem lande northweardum with tha Westsae.' and means 'He said - that he lived in the northern land near the Western Sea.') - -Braille: - - ⡌⠁⠧⠑ ⠼⠁⠒ ⡍⠜⠇⠑⠹⠰⠎ ⡣⠕⠌ - - ⡍⠜⠇⠑⠹ ⠺⠁⠎ ⠙⠑⠁⠙⠒ ⠞⠕ ⠃⠑⠛⠔ ⠺⠊⠹⠲ ⡹⠻⠑ ⠊⠎ ⠝⠕ ⠙⠳⠃⠞ - ⠱⠁⠞⠑⠧⠻ ⠁⠃⠳⠞ ⠹⠁⠞⠲ ⡹⠑ ⠗⠑⠛⠊⠌⠻ ⠕⠋ ⠙⠊⠎ ⠃⠥⠗⠊⠁⠇ ⠺⠁⠎ - ⠎⠊⠛⠝⠫ ⠃⠹ ⠹⠑ ⠊⠇⠻⠛⠹⠍⠁⠝⠂ ⠹⠑ ⠊⠇⠻⠅⠂ ⠹⠑ ⠥⠝⠙⠻⠞⠁⠅⠻⠂ - ⠁⠝⠙ ⠹⠑ ⠡⠊⠑⠋ ⠍⠳⠗⠝⠻⠲ ⡎⠊⠗⠕⠕⠛⠑ ⠎⠊⠛⠝⠫ ⠊⠞⠲ ⡁⠝⠙ - ⡎⠊⠗⠕⠕⠛⠑⠰⠎ ⠝⠁⠍⠑ ⠺⠁⠎ ⠛⠕⠕⠙ ⠥⠏⠕⠝ ⠰⡡⠁⠝⠛⠑⠂ ⠋⠕⠗ ⠁⠝⠹⠹⠔⠛ ⠙⠑ - ⠡⠕⠎⠑ ⠞⠕ ⠏⠥⠞ ⠙⠊⠎ ⠙⠁⠝⠙ ⠞⠕⠲ - - ⡕⠇⠙ ⡍⠜⠇⠑⠹ ⠺⠁⠎ ⠁⠎ ⠙⠑⠁⠙ ⠁⠎ ⠁ ⠙⠕⠕⠗⠤⠝⠁⠊⠇⠲ - - ⡍⠔⠙⠖ ⡊ ⠙⠕⠝⠰⠞ ⠍⠑⠁⠝ ⠞⠕ ⠎⠁⠹ ⠹⠁⠞ ⡊ ⠅⠝⠪⠂ ⠕⠋ ⠍⠹ - ⠪⠝ ⠅⠝⠪⠇⠫⠛⠑⠂ ⠱⠁⠞ ⠹⠻⠑ ⠊⠎ ⠏⠜⠞⠊⠊⠥⠇⠜⠇⠹ ⠙⠑⠁⠙ ⠁⠃⠳⠞ - ⠁ ⠙⠕⠕⠗⠤⠝⠁⠊⠇⠲ ⡊ ⠍⠊⠣⠞ ⠙⠁⠧⠑ ⠃⠑⠲ ⠔⠊⠇⠔⠫⠂ ⠍⠹⠎⠑⠇⠋⠂ ⠞⠕ - ⠗⠑⠛⠜⠙ ⠁ ⠊⠕⠋⠋⠔⠤⠝⠁⠊⠇ ⠁⠎ ⠹⠑ ⠙⠑⠁⠙⠑⠌ ⠏⠊⠑⠊⠑ ⠕⠋ ⠊⠗⠕⠝⠍⠕⠝⠛⠻⠹ - ⠔ ⠹⠑ ⠞⠗⠁⠙⠑⠲ ⡃⠥⠞ ⠹⠑ ⠺⠊⠎⠙⠕⠍ ⠕⠋ ⠳⠗ ⠁⠝⠊⠑⠌⠕⠗⠎ - ⠊⠎ ⠔ ⠹⠑ ⠎⠊⠍⠊⠇⠑⠆ ⠁⠝⠙ ⠍⠹ ⠥⠝⠙⠁⠇⠇⠪⠫ ⠙⠁⠝⠙⠎ - ⠩⠁⠇⠇ ⠝⠕⠞ ⠙⠊⠌⠥⠗⠃ ⠊⠞⠂ ⠕⠗ ⠹⠑ ⡊⠳⠝⠞⠗⠹⠰⠎ ⠙⠕⠝⠑ ⠋⠕⠗⠲ ⡹⠳ - ⠺⠊⠇⠇ ⠹⠻⠑⠋⠕⠗⠑ ⠏⠻⠍⠊⠞ ⠍⠑ ⠞⠕ ⠗⠑⠏⠑⠁⠞⠂ ⠑⠍⠏⠙⠁⠞⠊⠊⠁⠇⠇⠹⠂ ⠹⠁⠞ - ⡍⠜⠇⠑⠹ ⠺⠁⠎ ⠁⠎ ⠙⠑⠁⠙ ⠁⠎ ⠁ ⠙⠕⠕⠗⠤⠝⠁⠊⠇⠲ - - (The first couple of paragraphs of "A Christmas Carol" by Dickens) - -Compact font selection example text: - - ABCDEFGHIJKLMNOPQRSTUVWXYZ /0123456789 - abcdefghijklmnopqrstuvwxyz £©µÀÆÖÞßéöÿ - –—‘“”„†•…‰™œŠŸž€ ΑΒΓΔΩαβγδω АБВГДабвгд - ∀∂∈ℝ∧∪≡∞ ↑↗↨↻⇣ ┐┼╔╘░►☺♀ fi�⑀₂ἠḂӥẄɐː⍎אԱა - -Greetings in various languages: - - Hello world, Καλημέρα κόσμε, コンニチハ - -Box drawing alignment tests: █ - ▉ - ╔══╦══╗ ┌──┬──┐ ╭──┬──╮ ╭──┬──╮ ┏━━┳━━┓ ┎┒┏┑ ╷ ╻ ┏┯┓ ┌┰┐ ▊ ╱╲╱╲╳╳╳ - ║┌─╨─┐║ │╔═╧═╗│ │╒═╪═╕│ │╓─╁─╖│ ┃┌─╂─┐┃ ┗╃╄┙ ╶┼╴╺╋╸┠┼┨ ┝╋┥ ▋ ╲╱╲╱╳╳╳ - ║│╲ ╱│║ │║ ║│ ││ │ ││ │║ ┃ ║│ ┃│ ╿ │┃ ┍╅╆┓ ╵ ╹ ┗┷┛ └┸┘ ▌ ╱╲╱╲╳╳╳ - ╠╡ ╳ ╞╣ ├╢ ╟┤ ├┼─┼─┼┤ ├╫─╂─╫┤ ┣┿╾┼╼┿┫ ┕┛┖┚ ┌┄┄┐ ╎ ┏┅┅┓ ┋ ▍ ╲╱╲╱╳╳╳ - ║│╱ ╲│║ │║ ║│ ││ │ ││ │║ ┃ ║│ ┃│ ╽ │┃ ░░▒▒▓▓██ ┊ ┆ ╎ ╏ ┇ ┋ ▎ - ║└─╥─┘║ │╚═╤═╝│ │╘═╪═╛│ │╙─╀─╜│ ┃└─╂─┘┃ ░░▒▒▓▓██ ┊ ┆ ╎ ╏ ┇ ┋ ▏ - ╚══╩══╝ └──┴──┘ ╰──┴──╯ ╰──┴──╯ ┗━━┻━━┛ ▗▄▖▛▀▜ └╌╌┘ ╎ ┗╍╍┛ ┋ ▁▂▃▄▅▆▇█ - ▝▀▘▙▄▟ +Sentences that contain all letters commonly used in a language +-------------------------------------------------------------- + +Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/> -- 2001-09-02 + +This file is UTF-8 encoded. + + +Danish (da) +--------- + + Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen + Wolther spillede på xylofon. + (= Quiz contestants were eating strawbery with cream while Wolther + the circus clown played on xylophone.) + +German (de) +----------- + + Falsches Üben von Xylophonmusik quält jeden größeren Zwerg + (= Wrongful practicing of xylophone music tortures every larger dwarf) + + Zwölf Boxkämpfer jagten Eva quer über den Sylter Deich + (= Twelve boxing fighters hunted Eva across the dike of Sylt) + + Heizölrückstoßabdämpfung + (= fuel oil recoil absorber) + (jqvwxy missing, but all non-ASCII letters in one word) + +English (en) +------------ + + The quick brown fox jumps over the lazy dog + +Spanish (es) +------------ + + El pingüino Wenceslao hizo kilómetros bajo exhaustiva lluvia y + frío, añoraba a su querido cachorro. + (Contains every letter and every accent, but not every combination + of vowel + acute.) + +French (fr) +----------- + + Portez ce vieux whisky au juge blond qui fume sur son île intérieure, à + côté de l'alcôve ovoïde, où les bûches se consument dans l'âtre, ce + qui lui permet de penser à la cænogenèse de l'être dont il est question + dans la cause ambiguë entendue à Moÿ, dans un capharnaüm qui, + pense-t-il, diminue çà et là la qualité de son œuvre. + + l'île exiguë + Où l'obèse jury mûr + Fête l'haï volapük, + Âne ex aéquo au whist, + Ôtez ce vœu déçu. + + Le cœur déçu mais l'âme plutôt naïve, Louÿs rêva de crapaüter en + canoë au delà des îles, près du mälström où brûlent les novæ. + +Irish Gaelic (ga) +----------------- + + D'fhuascail Íosa, Úrmhac na hÓighe Beannaithe, pór Éava agus Ádhaimh + +Hungarian (hu) +-------------- + + Árvíztűrő tükörfúrógép + (= flood-proof mirror-drilling machine, only all non-ASCII letters) + +Icelandic (is) +-------------- + + Kæmi ný öxi hér ykist þjófum nú bæði víl og ádrepa + + Sævör grét áðan því úlpan var ónýt + (some ASCII letters missing) + +Japanese (jp) +------------- + + Hiragana: (Iroha) + + いろはにほへとちりぬるを + わかよたれそつねならむ + うゐのおくやまけふこえて + あさきゆめみしゑひもせす + + Katakana: + + イロハニホヘト チリヌルヲ ワカヨタレソ ツネナラム + ウヰノオクヤマ ケフコエテ アサキユメミシ ヱヒモセスン + +Hebrew (iw) +----------- + + ? דג סקרן שט בים מאוכזב ולפתע מצא לו חברה איך הקליטה + +Polish (pl) +----------- + + Pchnąć w tę łódź jeża lub ośm skrzyń fig + (= To push a hedgehog or eight bins of figs in this boat) + +Russian (ru) +------------ + + В чащах юга жил бы цитрус? Да, но фальшивый экземпляр! + (= Would a citrus live in the bushes of south? Yes, but only a fake one!) + +Thai (th) +--------- + + [--------------------------|------------------------] + ๏ เป็นมนุษย์สุดประเสริฐเลิศคุณค่า กว่าบรรดาฝูงสัตว์เดรัจฉาน + จงฝ่าฟันพัฒนาวิชาการ อย่าล้างผลาญฤๅเข่นฆ่าบีฑาใคร + ไม่ถือโทษโกรธแช่งซัดฮึดฮัดด่า หัดอภัยเหมือนกีฬาอัชฌาสัย + ปฏิบัติประพฤติกฎกำหนดใจ พูดจาให้จ๊ะๆ จ๋าๆ น่าฟังเอย ฯ + + [The copyright for the Thai example is owned by The Computer + Association of Thailand under the Royal Patronage of His Majesty the + King.] + +Please let me know if you find others! Special thanks to the people +from all over the world who contributed these sentences. +? *Unicode Transcriptions* Notes <#Notes> + +Glyphs <http://www.macchiato.com/unicode/show.html> | Samples +<http://www.macchiato.com/unicode/Unicode_transcriptions.html> | Charts +<http://www.macchiato.com/unicode/charts.html> | UTF +<http://www.macchiato.com/unicode/convert.html> | Forms +<http://www-4.ibm.com/software/developer/library/utfencodingforms/> | +Home <http://www.macchiato.com>. +<http://member.linkexchange.com/cgi-bin/fc/fastcounter-login?750641> + +Name Text Image +Arabic (Arabic) يونِكود ? +Arabic (Persian) یونیکُد / ?/ +Armenian Յունիկօդ +Bengali য়ূনিকোড +Bopomofo ㄊㄨㄥ˅ ㄧˋ ㄇㄚ˅ +ㄨㄢˋ ㄍㄨㄛˊ ㄇㄚ˅ +Braille +Buhid +Canadian Aboriginal ᔫᗂᑰᑦ +Cherokee ᏳᏂᎪᏛ +Cypriot +Cyrillic (Russian) Юникод ? +Deseret (English) ??????? +Devanagari (Hindi) यूनिकोड ? +Ethiopic ዩኒኮድ +Georgian უნიკოდი ? +Gothic +Greek Γιούνικοντ +Gujarati યૂનિકોડ +Gurmukhi ਯੂਨਿਕੋਡ +Han (Chinese) 统一码 ? +統一碼 ? +万国码 ? +萬國碼 ? +Hangul 유니코드 +Hanunoo +Hebrew יוניקוד +Hebrew (pointed) יוּנִיקוׁד +Hebrew (Yiddish) יוניקאָד ? +Hiragana (Japanese) ゆにこおど +Katakana (Japanese) ユニコード ? +Kannada ಯೂನಿಕೋಡ್ +Khmer យូនីគោដ +Lao +Latin Unicode Unicode +Latin (IPA <#English_Pronunciation>) ˈjunɪˌkoːd ? +Latin (Am. Dict. <#American_Dictionary>) Ūnĭcōde̽ ? +Limbu +Linear B +Malayalam യൂനികോഡ് +Mongolian +Myanmar +Ogham ᚔᚒᚅᚔᚉᚑᚇ / / +Old Italic +Oriya ୟୂନିକୋଡ +Osmanya +Runic (Anglo-Saxon) ᛡᚢᚾᛁᚳᚩᛞ +Shavian +Sinhala යණනිකෞද් +Syriac ܝܘܢܝܩܘܕ +Tagbanwa +Tagalog +Tai Le +Tamil யூனிகோட் +Telugu యూనికోడ్ +Thaana +Thai ยูนืโคด +Tibetan (Dzongkha) ཨུ་ནི་ཀོཌྲ། +Ugaritic +Yi + + + Notes: + +There are different ways to transcribe the word “Unicode”, depending on +the language and script. In some cases there is only one language that +customarily uses a given script; in others there are many languages. The +goal here is at a minimum to collect at least one transcription for each +script in a language customarily written in that script, with more +languages if possible. If the transcription is the same for multiple +languages in a script, then a single representative language is used. + +Still missing are transcriptions for the items above in RED (in at least +one language). I would appreciate any other transcriptions, or +corrections for the ones listed here. Send to mark3@macchiato.com +<mailto:mark3@macchiato.com>, using the directions below: + + * *Supplying Missing Items* + o Most Latin-script languages will follow the spelling, and + change the pronunciation. For any that would not, it would + be good to have the alternate spelling. + o For non-Latin scripts the goal is to match the English + pronunciation — /*not*/ spelling. Above is the IPA <#IPA> + (in phonemic transcription) that should be matched as + closely as possible (without sounding affected in the target + language) + o Text would be best in either the UTF-8 text, or the code + points in hex HTML. E.g. either of the following: + + "Юникод" + + "Юникод" + + Note: for / supplementary characters/ + <http://www.unicode.org/glossary/#supplementary_character>, + there should be one hex number per code point, not two + surrogates + <http://www.unicode.org/glossary/#surrogate_code_point>: + # 𐀀 /*not*/ �&xDC00; + o If you have a good font, I'd also appreciate a GIF. It + should be *96 x 24* bits, with the text centered, in black + on white (plus grays if smoothed). + * *Other Comments* + o Because some browsers won't handle the text, both text and + GIF image are supplied. If you can’t read the text columns, + see Display Problems + <http://www.unicode.org/help/display_problems.html>. + o The Chinese versions (inc. Bopomofo) are translations, not + transcriptions, since "transcription in Chinese is pretty + lame" [J. Becker]. + o There are other "translations" of Unicode that may be in + use, such as the Vietnamese "Thống Nhất Mã". + o For sample pages in different languages on the Unicode site, + see What is Unicode? + <http://www.unicode.org/unicode/standard/WhatIsUnicode.html> + o Americans are not generally used to IPA, and find a variety + of different systems in their dictionaries. This one leaves + the base letters as they are, and uses diacritics for + pronunciation. + * *Etymology of /Unicode/* + o Coined by J. Becker. Not related to previous usages, such as: + + A telegraphic code in which one word or set of letters + represents a sentence or phrase; a telegram or message + in this. (late 19th century, OED) + o According to my references, the prefix "uni" is directly + from Latin while the word "code" is through French. + o The original Indo-European apparently would have been + *oino-kau-do ("one strike give"): *kau apparently being + related to such English words as: hew, haggle, hoe, hag, + hay, hack, caudad, caudal, caudate, caudex, coda, codex, + codicil, coward, incus, and Kovač (personal name: "smith"). + + I will leave the exact derivations to the exegetes, + but I like the association with "haggle" myself. + * *Contributions* + o This draws on contributions or comments from: + + Dixon Au + + Joe Becker + + Maurice Bauhahn + + Abel Cheung + + Peter Constable + + Michael Everson + + Christopher John Fynn + + Michael Kaplan + + George Kiraz + + Abdul Malik + + Siva Nataraja + + Roozbeh Pournader + + Jonathan Rosenne + + Jungshik Shin + +------------------------------------------------------------------------ + + +Terms of Use <http://www.macchiato.com/terms_of_use.html>. Last updated: +MED - 04/20/2003 15:30:33. +<http://member.linkexchange.com/cgi-bin/fc/fastcounter-login?750641> + + + + +UTF-8 encoded sample plain-text file +‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ + +Markus Kuhn [ˈmaʳkʊs kuːn] <http://www.cl.cam.ac.uk/~mgk25/> — 2002-07-25 + + +The ASCII compatible UTF-8 encoding used in this plain-text file +is defined in Unicode, ISO 10646-1, and RFC 2279. + + +Using Unicode/UTF-8, you can write in emails and source code things such as + +Mathematics and sciences: + + ∮ E⋅da = Q, n → ∞, ∑ f(i) = ∏ g(i), ⎧⎡⎛┌─────┐⎞⎤⎫ + ⎪⎢⎜│a²+b³ ⎟⎥⎪ + ∀x∈ℝ: ⌈x⌉ = −⌊−x⌋, α ∧ ¬β = ¬(¬α ∨ β), ⎪⎢⎜│───── ⎟⎥⎪ + ⎪⎢⎜⎷ c₈ ⎟⎥⎪ + ℕ ⊆ ℕ₀ ⊂ ℤ ⊂ ℚ ⊂ ℝ ⊂ ℂ, ⎨⎢⎜ ⎟⎥⎬ + ⎪⎢⎜ ∞ ⎟⎥⎪ + ⊥ < a ≠ b ≡ c ≤ d ≪ ⊤ ⇒ (⟦A⟧ ⇔ ⟪B⟫), ⎪⎢⎜ ⎲ ⎟⎥⎪ + ⎪⎢⎜ ⎳aⁱ-bⁱ⎟⎥⎪ + 2H₂ + O₂ ⇌ 2H₂O, R = 4.7 kΩ, ⌀ 200 mm ⎩⎣⎝i=1 ⎠⎦⎭ + +Linguistics and dictionaries: + + ði ıntəˈnæʃənəl fəˈnɛtık əsoʊsiˈeıʃn + Y [ˈʏpsilɔn], Yen [jɛn], Yoga [ˈjoːgɑ] + +APL: + + ((V⍳V)=⍳⍴V)/V←,V ⌷←⍳→⍴∆∇⊃‾⍎⍕⌈ + +Nicer typography in plain text files: + + ╔══════════════════════════════════════════╗ + ║ ║ + ║ • ‘single’ and “double” quotes ║ + ║ ║ + ║ • Curly apostrophes: “We’ve been here” ║ + ║ ║ + ║ • Latin-1 apostrophe and accents: '´` ║ + ║ ║ + ║ • ‚deutsche‘ „Anführungszeichen“ ║ + ║ ║ + ║ • †, ‡, ‰, •, 3–4, —, −5/+5, ™, … ║ + ║ ║ + ║ • ASCII safety test: 1lI|, 0OD, 8B ║ + ║ ╭─────────╮ ║ + ║ • the euro symbol: │ 14.95 € │ ║ + ║ ╰─────────╯ ║ + ╚══════════════════════════════════════════╝ + +Combining characters: + + STARGΛ̊TE SG-1, a = v̇ = r̈, a⃑ ⊥ b⃑ + +Greek (in Polytonic): + + The Greek anthem: + + Σὲ γνωρίζω ἀπὸ τὴν κόψη + τοῦ σπαθιοῦ τὴν τρομερή, + σὲ γνωρίζω ἀπὸ τὴν ὄψη + ποὺ μὲ βία μετράει τὴ γῆ. + + ᾿Απ᾿ τὰ κόκκαλα βγαλμένη + τῶν ῾Ελλήνων τὰ ἱερά + καὶ σὰν πρῶτα ἀνδρειωμένη + χαῖρε, ὦ χαῖρε, ᾿Ελευθεριά! + + From a speech of Demosthenes in the 4th century BC: + + Οὐχὶ ταὐτὰ παρίσταταί μοι γιγνώσκειν, ὦ ἄνδρες ᾿Αθηναῖοι, + ὅταν τ᾿ εἰς τὰ πράγματα ἀποβλέψω καὶ ὅταν πρὸς τοὺς + λόγους οὓς ἀκούω· τοὺς μὲν γὰρ λόγους περὶ τοῦ + τιμωρήσασθαι Φίλιππον ὁρῶ γιγνομένους, τὰ δὲ πράγματ᾿ + εἰς τοῦτο προήκοντα, ὥσθ᾿ ὅπως μὴ πεισόμεθ᾿ αὐτοὶ + πρότερον κακῶς σκέψασθαι δέον. οὐδέν οὖν ἄλλο μοι δοκοῦσιν + οἱ τὰ τοιαῦτα λέγοντες ἢ τὴν ὑπόθεσιν, περὶ ἧς βουλεύεσθαι, + οὐχὶ τὴν οὖσαν παριστάντες ὑμῖν ἁμαρτάνειν. ἐγὼ δέ, ὅτι μέν + ποτ᾿ ἐξῆν τῇ πόλει καὶ τὰ αὑτῆς ἔχειν ἀσφαλῶς καὶ Φίλιππον + τιμωρήσασθαι, καὶ μάλ᾿ ἀκριβῶς οἶδα· ἐπ᾿ ἐμοῦ γάρ, οὐ πάλαι + γέγονεν ταῦτ᾿ ἀμφότερα· νῦν μέντοι πέπεισμαι τοῦθ᾿ ἱκανὸν + προλαβεῖν ἡμῖν εἶναι τὴν πρώτην, ὅπως τοὺς συμμάχους + σώσομεν. ἐὰν γὰρ τοῦτο βεβαίως ὑπάρξῃ, τότε καὶ περὶ τοῦ + τίνα τιμωρήσεταί τις καὶ ὃν τρόπον ἐξέσται σκοπεῖν· πρὶν δὲ + τὴν ἀρχὴν ὀρθῶς ὑποθέσθαι, μάταιον ἡγοῦμαι περὶ τῆς + τελευτῆς ὁντινοῦν ποιεῖσθαι λόγον. + + Δημοσθένους, Γ´ ᾿Ολυνθιακὸς + +Georgian: + + From a Unicode conference invitation: + + გთხოვთ ახლავე გაიაროთ რეგისტრაცია Unicode-ის მეათე საერთაშორისო + კონფერენციაზე დასასწრებად, რომელიც გაიმართება 10-12 მარტს, + ქ. მაინცში, გერმანიაში. კონფერენცია შეჰკრებს ერთად მსოფლიოს + ექსპერტებს ისეთ დარგებში როგორიცაა ინტერნეტი და Unicode-ი, + ინტერნაციონალიზაცია და ლოკალიზაცია, Unicode-ის გამოყენება + ოპერაციულ სისტემებსა, და გამოყენებით პროგრამებში, შრიფტებში, + ტექსტების დამუშავებასა და მრავალენოვან კომპიუტერულ სისტემებში. + +Russian: + + From a Unicode conference invitation: + + Зарегистрируйтесь сейчас на Десятую Международную Конференцию по + Unicode, которая состоится 10-12 марта 1997 года в Майнце в Германии. + Конференция соберет широкий круг экспертов по вопросам глобального + Интернета и Unicode, локализации и интернационализации, воплощению и + применению Unicode в различных операционных системах и программных + приложениях, шрифтах, верстке и многоязычных компьютерных системах. + +Thai (UCS Level 2): + + Excerpt from a poetry on The Romance of The Three Kingdoms (a Chinese + classic 'San Gua'): + + [----------------------------|------------------------] + ๏ แผ่นดินฮั่นเสื่อมโทรมแสนสังเวช พระปกเกศกองบู๊กู้ขึ้นใหม่ + สิบสองกษัตริย์ก่อนหน้าแลถัดไป สององค์ไซร้โง่เขลาเบาปัญญา + ทรงนับถือขันทีเป็นที่พึ่ง บ้านเมืองจึงวิปริตเป็นนักหนา + โฮจิ๋นเรียกทัพทั่วหัวเมืองมา หมายจะฆ่ามดชั่วตัวสำคัญ + เหมือนขับไสไล่เสือจากเคหา รับหมาป่าเข้ามาเลยอาสัญ + ฝ่ายอ้องอุ้นยุแยกให้แตกกัน ใช้สาวนั้นเป็นชนวนชื่นชวนใจ + พลันลิฉุยกุยกีกลับก่อเหตุ ช่างอาเพศจริงหนาฟ้าร้องไห้ + ต้องรบราฆ่าฟันจนบรรลัย ฤๅหาใครค้ำชูกู้บรรลังก์ ฯ + + (The above is a two-column text. If combining characters are handled + correctly, the lines of the second column should be aligned with the + | character above.) + +Ethiopian: + + Proverbs in the Amharic language: + + ሰማይ አይታረስ ንጉሥ አይከሰስ። + ብላ ካለኝ እንደአባቴ በቆመጠኝ። + ጌጥ ያለቤቱ ቁምጥና ነው። + ደሀ በሕልሙ ቅቤ ባይጠጣ ንጣት በገደለው። + የአፍ ወለምታ በቅቤ አይታሽም። + አይጥ በበላ ዳዋ ተመታ። + ሲተረጉሙ ይደረግሙ። + ቀስ በቀስ፥ ዕንቁላል በእግሩ ይሄዳል። + ድር ቢያብር አንበሳ ያስር። + ሰው እንደቤቱ እንጅ እንደ ጉረቤቱ አይተዳደርም። + እግዜር የከፈተውን ጉሮሮ ሳይዘጋው አይድርም። + የጎረቤት ሌባ፥ ቢያዩት ይስቅ ባያዩት ያጠልቅ። + ሥራ ከመፍታት ልጄን ላፋታት። + ዓባይ ማደሪያ የለው፥ ግንድ ይዞ ይዞራል። + የእስላም አገሩ መካ የአሞራ አገሩ ዋርካ። + ተንጋሎ ቢተፉ ተመልሶ ባፉ። + ወዳጅህ ማር ቢሆን ጨርስህ አትላሰው። + እግርህን በፍራሽህ ልክ ዘርጋ። + +Runes: + + ᚻᛖ ᚳᚹᚫᚦ ᚦᚫᛏ ᚻᛖ ᛒᚢᛞᛖ ᚩᚾ ᚦᚫᛗ ᛚᚪᚾᛞᛖ ᚾᚩᚱᚦᚹᛖᚪᚱᛞᚢᛗ ᚹᛁᚦ ᚦᚪ ᚹᛖᛥᚫ + + (Old English, which transcribed into Latin reads 'He cwaeth that he + bude thaem lande northweardum with tha Westsae.' and means 'He said + that he lived in the northern land near the Western Sea.') + +Braille: + + ⡌⠁⠧⠑ ⠼⠁⠒ ⡍⠜⠇⠑⠹⠰⠎ ⡣⠕⠌ + + ⡍⠜⠇⠑⠹ ⠺⠁⠎ ⠙⠑⠁⠙⠒ ⠞⠕ ⠃⠑⠛⠔ ⠺⠊⠹⠲ ⡹⠻⠑ ⠊⠎ ⠝⠕ ⠙⠳⠃⠞ + ⠱⠁⠞⠑⠧⠻ ⠁⠃⠳⠞ ⠹⠁⠞⠲ ⡹⠑ ⠗⠑⠛⠊⠌⠻ ⠕⠋ ⠙⠊⠎ ⠃⠥⠗⠊⠁⠇ ⠺⠁⠎ + ⠎⠊⠛⠝⠫ ⠃⠹ ⠹⠑ ⠊⠇⠻⠛⠹⠍⠁⠝⠂ ⠹⠑ ⠊⠇⠻⠅⠂ ⠹⠑ ⠥⠝⠙⠻⠞⠁⠅⠻⠂ + ⠁⠝⠙ ⠹⠑ ⠡⠊⠑⠋ ⠍⠳⠗⠝⠻⠲ ⡎⠊⠗⠕⠕⠛⠑ ⠎⠊⠛⠝⠫ ⠊⠞⠲ ⡁⠝⠙ + ⡎⠊⠗⠕⠕⠛⠑⠰⠎ ⠝⠁⠍⠑ ⠺⠁⠎ ⠛⠕⠕⠙ ⠥⠏⠕⠝ ⠰⡡⠁⠝⠛⠑⠂ ⠋⠕⠗ ⠁⠝⠹⠹⠔⠛ ⠙⠑ + ⠡⠕⠎⠑ ⠞⠕ ⠏⠥⠞ ⠙⠊⠎ ⠙⠁⠝⠙ ⠞⠕⠲ + + ⡕⠇⠙ ⡍⠜⠇⠑⠹ ⠺⠁⠎ ⠁⠎ ⠙⠑⠁⠙ ⠁⠎ ⠁ ⠙⠕⠕⠗⠤⠝⠁⠊⠇⠲ + + ⡍⠔⠙⠖ ⡊ ⠙⠕⠝⠰⠞ ⠍⠑⠁⠝ ⠞⠕ ⠎⠁⠹ ⠹⠁⠞ ⡊ ⠅⠝⠪⠂ ⠕⠋ ⠍⠹ + ⠪⠝ ⠅⠝⠪⠇⠫⠛⠑⠂ ⠱⠁⠞ ⠹⠻⠑ ⠊⠎ ⠏⠜⠞⠊⠊⠥⠇⠜⠇⠹ ⠙⠑⠁⠙ ⠁⠃⠳⠞ + ⠁ ⠙⠕⠕⠗⠤⠝⠁⠊⠇⠲ ⡊ ⠍⠊⠣⠞ ⠙⠁⠧⠑ ⠃⠑⠲ ⠔⠊⠇⠔⠫⠂ ⠍⠹⠎⠑⠇⠋⠂ ⠞⠕ + ⠗⠑⠛⠜⠙ ⠁ ⠊⠕⠋⠋⠔⠤⠝⠁⠊⠇ ⠁⠎ ⠹⠑ ⠙⠑⠁⠙⠑⠌ ⠏⠊⠑⠊⠑ ⠕⠋ ⠊⠗⠕⠝⠍⠕⠝⠛⠻⠹ + ⠔ ⠹⠑ ⠞⠗⠁⠙⠑⠲ ⡃⠥⠞ ⠹⠑ ⠺⠊⠎⠙⠕⠍ ⠕⠋ ⠳⠗ ⠁⠝⠊⠑⠌⠕⠗⠎ + ⠊⠎ ⠔ ⠹⠑ ⠎⠊⠍⠊⠇⠑⠆ ⠁⠝⠙ ⠍⠹ ⠥⠝⠙⠁⠇⠇⠪⠫ ⠙⠁⠝⠙⠎ + ⠩⠁⠇⠇ ⠝⠕⠞ ⠙⠊⠌⠥⠗⠃ ⠊⠞⠂ ⠕⠗ ⠹⠑ ⡊⠳⠝⠞⠗⠹⠰⠎ ⠙⠕⠝⠑ ⠋⠕⠗⠲ ⡹⠳ + ⠺⠊⠇⠇ ⠹⠻⠑⠋⠕⠗⠑ ⠏⠻⠍⠊⠞ ⠍⠑ ⠞⠕ ⠗⠑⠏⠑⠁⠞⠂ ⠑⠍⠏⠙⠁⠞⠊⠊⠁⠇⠇⠹⠂ ⠹⠁⠞ + ⡍⠜⠇⠑⠹ ⠺⠁⠎ ⠁⠎ ⠙⠑⠁⠙ ⠁⠎ ⠁ ⠙⠕⠕⠗⠤⠝⠁⠊⠇⠲ + + (The first couple of paragraphs of "A Christmas Carol" by Dickens) + +Compact font selection example text: + + ABCDEFGHIJKLMNOPQRSTUVWXYZ /0123456789 + abcdefghijklmnopqrstuvwxyz £©µÀÆÖÞßéöÿ + –—‘“”„†•…‰™œŠŸž€ ΑΒΓΔΩαβγδω АБВГДабвгд + ∀∂∈ℝ∧∪≡∞ ↑↗↨↻⇣ ┐┼╔╘░►☺♀ fi�⑀₂ἠḂӥẄɐː⍎אԱა + +Greetings in various languages: + + Hello world, Καλημέρα κόσμε, コンニチハ + +Box drawing alignment tests: █ + ▉ + ╔══╦══╗ ┌──┬──┐ ╭──┬──╮ ╭──┬──╮ ┏━━┳━━┓ ┎┒┏┑ ╷ ╻ ┏┯┓ ┌┰┐ ▊ ╱╲╱╲╳╳╳ + ║┌─╨─┐║ │╔═╧═╗│ │╒═╪═╕│ │╓─╁─╖│ ┃┌─╂─┐┃ ┗╃╄┙ ╶┼╴╺╋╸┠┼┨ ┝╋┥ ▋ ╲╱╲╱╳╳╳ + ║│╲ ╱│║ │║ ║│ ││ │ ││ │║ ┃ ║│ ┃│ ╿ │┃ ┍╅╆┓ ╵ ╹ ┗┷┛ └┸┘ ▌ ╱╲╱╲╳╳╳ + ╠╡ ╳ ╞╣ ├╢ ╟┤ ├┼─┼─┼┤ ├╫─╂─╫┤ ┣┿╾┼╼┿┫ ┕┛┖┚ ┌┄┄┐ ╎ ┏┅┅┓ ┋ ▍ ╲╱╲╱╳╳╳ + ║│╱ ╲│║ │║ ║│ ││ │ ││ │║ ┃ ║│ ┃│ ╽ │┃ ░░▒▒▓▓██ ┊ ┆ ╎ ╏ ┇ ┋ ▎ + ║└─╥─┘║ │╚═╤═╝│ │╘═╪═╛│ │╙─╀─╜│ ┃└─╂─┘┃ ░░▒▒▓▓██ ┊ ┆ ╎ ╏ ┇ ┋ ▏ + ╚══╩══╝ └──┴──┘ ╰──┴──╯ ╰──┴──╯ ┗━━┻━━┛ ▗▄▖▛▀▜ └╌╌┘ ╎ ┗╍╍┛ ┋ ▁▂▃▄▅▆▇█ + ▝▀▘▙▄▟ diff --git a/util/charset/ut/ya.make b/util/charset/ut/ya.make index 6526815e92..2d6a618938 100644 --- a/util/charset/ut/ya.make +++ b/util/charset/ut/ya.make @@ -4,7 +4,7 @@ OWNER(g:util) SUBSCRIBER(g:util-subscribers) DATA(arcadia/util/charset/ut/utf8) - + SRCS( utf8_ut.cpp wide_ut.cpp diff --git a/util/charset/utf8_ut.cpp b/util/charset/utf8_ut.cpp index 9e68881cca..fc735f8331 100644 --- a/util/charset/utf8_ut.cpp +++ b/util/charset/utf8_ut.cpp @@ -1,9 +1,9 @@ #include "utf8.h" #include "wide.h" -#include <util/stream/file.h> +#include <util/stream/file.h> #include <util/ysaveload.h> - + #include <library/cpp/testing/unittest/registar.h> #include <library/cpp/testing/unittest/env.h> @@ -51,7 +51,7 @@ Y_UNIT_TEST_SUITE(TUtfUtilTest) { } } } - + Y_UNIT_TEST(TestToUpperUtfString) { UNIT_ASSERT_VALUES_EQUAL(ToUpperUTF8("xyz XYZ привет!"), "XYZ XYZ ПРИВЕТ!"); @@ -94,10 +94,10 @@ Y_UNIT_TEST_SUITE(TUtfUtilTest) { Y_UNIT_TEST(TestUTF8ToWide) { TFileInput in(ArcadiaSourceRoot() + TStringBuf("/util/charset/ut/utf8/test1.txt")); - + TString text = in.ReadAll(); - UNIT_ASSERT(WideToUTF8(UTF8ToWide(text)) == text); - } + UNIT_ASSERT(WideToUTF8(UTF8ToWide(text)) == text); + } Y_UNIT_TEST(TestInvalidUTF8) { TVector<TString> testData; diff --git a/util/charset/wide.h b/util/charset/wide.h index 04e6928aab..f26e4c2a67 100644 --- a/util/charset/wide.h +++ b/util/charset/wide.h @@ -457,59 +457,59 @@ inline TUtf16String UTF32ToWide(const wchar32* begin, size_t len) { return res; } -// adopted from https://chromium.googlesource.com/chromium/src/+/master/base/strings/string_util.cc -// Assuming that a pointer is the size of a "machine word", then -// uintptr_t is an integer type that is also a machine word. - -namespace NDetail { - using TMachineWord = uintptr_t; - const uintptr_t kMachineWordAlignmentMask = sizeof(TMachineWord) - 1; - - inline bool IsAlignedToMachineWord(const void* pointer) { - return !(reinterpret_cast<TMachineWord>(pointer) & kMachineWordAlignmentMask); - } - +// adopted from https://chromium.googlesource.com/chromium/src/+/master/base/strings/string_util.cc +// Assuming that a pointer is the size of a "machine word", then +// uintptr_t is an integer type that is also a machine word. + +namespace NDetail { + using TMachineWord = uintptr_t; + const uintptr_t kMachineWordAlignmentMask = sizeof(TMachineWord) - 1; + + inline bool IsAlignedToMachineWord(const void* pointer) { + return !(reinterpret_cast<TMachineWord>(pointer) & kMachineWordAlignmentMask); + } + template <typename T> - inline T* AlignToMachineWord(T* pointer) { - return reinterpret_cast<T*>(reinterpret_cast<TMachineWord>(pointer) & ~kMachineWordAlignmentMask); - } - + inline T* AlignToMachineWord(T* pointer) { + return reinterpret_cast<T*>(reinterpret_cast<TMachineWord>(pointer) & ~kMachineWordAlignmentMask); + } + template <size_t size, typename CharacterType> - struct NonASCIIMask; - + struct NonASCIIMask; + template <> struct NonASCIIMask<4, wchar16> { static constexpr ui32 Value() { return 0xFF80FF80U; } - }; - + }; + template <> struct NonASCIIMask<4, char> { static constexpr ui32 Value() { return 0x80808080U; } - }; - + }; + template <> struct NonASCIIMask<8, wchar16> { static constexpr ui64 Value() { return 0xFF80FF80FF80FF80ULL; } - }; - + }; + template <> struct NonASCIIMask<8, char> { static constexpr ui64 Value() { return 0x8080808080808080ULL; } - }; - - template <typename TChar> + }; + + template <typename TChar> inline bool DoIsStringASCIISlow(const TChar* first, const TChar* last) { using TUnsignedChar = std::make_unsigned_t<TChar>; Y_ASSERT(first <= last); @@ -522,41 +522,41 @@ namespace NDetail { } template <typename TChar> - inline bool DoIsStringASCII(const TChar* first, const TChar* last) { + inline bool DoIsStringASCII(const TChar* first, const TChar* last) { if (last - first < 10) { return DoIsStringASCIISlow(first, last); } - TMachineWord allCharBits = 0; - TMachineWord nonAsciiBitMask = NonASCIIMask<sizeof(TMachineWord), TChar>::Value(); - - // Prologue: align the input. - while (!IsAlignedToMachineWord(first) && first != last) { - allCharBits |= *first; - ++first; - } - - // Compare the values of CPU word size. - const TChar* word_end = AlignToMachineWord(last); - const size_t loopIncrement = sizeof(TMachineWord) / sizeof(TChar); - while (first < word_end) { - allCharBits |= *(reinterpret_cast<const TMachineWord*>(first)); - first += loopIncrement; - - // fast exit - if (allCharBits & nonAsciiBitMask) { - return false; - } - } - - // Process the remaining bytes. - while (first != last) { - allCharBits |= *first; - ++first; - } - - return !(allCharBits & nonAsciiBitMask); - } - + TMachineWord allCharBits = 0; + TMachineWord nonAsciiBitMask = NonASCIIMask<sizeof(TMachineWord), TChar>::Value(); + + // Prologue: align the input. + while (!IsAlignedToMachineWord(first) && first != last) { + allCharBits |= *first; + ++first; + } + + // Compare the values of CPU word size. + const TChar* word_end = AlignToMachineWord(last); + const size_t loopIncrement = sizeof(TMachineWord) / sizeof(TChar); + while (first < word_end) { + allCharBits |= *(reinterpret_cast<const TMachineWord*>(first)); + first += loopIncrement; + + // fast exit + if (allCharBits & nonAsciiBitMask) { + return false; + } + } + + // Process the remaining bytes. + while (first != last) { + allCharBits |= *first; + ++first; + } + + return !(allCharBits & nonAsciiBitMask); + } + #ifdef _sse2_ inline bool DoIsStringASCIISSE(const unsigned char* first, const unsigned char* last) { //scalar version for short strings @@ -572,10 +572,10 @@ namespace NDetail { int asciiMask = _mm_movemask_epi8(chunk); if (asciiMask) { - return false; + return false; } first += 16; - } + } if (first + 8 <= last) { memcpy(buf, first, 8); @@ -589,15 +589,15 @@ namespace NDetail { } return ::NDetail::DoIsStringASCIISlow(first, last); - } + } #endif //_sse2_ - + } - + //! returns @c true if character sequence has no symbols with value greater than 0x7F template <typename TChar> inline bool IsStringASCII(const TChar* first, const TChar* last) { - return ::NDetail::DoIsStringASCII(first, last); + return ::NDetail::DoIsStringASCII(first, last); } #ifdef _sse2_ diff --git a/util/draft/date.h b/util/draft/date.h index e3eb616fe5..67922526fb 100644 --- a/util/draft/date.h +++ b/util/draft/date.h @@ -24,7 +24,7 @@ public: // XXX: wrong. Should be replace with two methods: TodayGmt() and TodayLocal() static TDate Today() { - return TDate(time(nullptr)); + return TDate(time(nullptr)); } TDate(const char* yyyymmdd); diff --git a/util/draft/datetime_ut.cpp b/util/draft/datetime_ut.cpp index a5e065ef6e..00dd602377 100644 --- a/util/draft/datetime_ut.cpp +++ b/util/draft/datetime_ut.cpp @@ -88,7 +88,7 @@ Y_UNIT_TEST_SUITE(TSimpleTMTest) { UNIT_ASSERT_VALUES_EQUAL((ui32)0, (ui32)TSimpleTM::New(0)); UNIT_ASSERT((ui32)TSimpleTM::New(0).IsUTC()); - time_t t = time(nullptr); + time_t t = time(nullptr); { struct tm tmt; diff --git a/util/draft/enum.h b/util/draft/enum.h index 18002b7df2..ed8536644a 100644 --- a/util/draft/enum.h +++ b/util/draft/enum.h @@ -24,7 +24,7 @@ const V* FindEnumFromStringImpl(K1 key, const std::pair<K2, V>* entries, size_t for (size_t i = 0; i < arraySize; i++) if (entries[i].first == key) return &entries[i].second; - return nullptr; + return nullptr; } // special version for const char* @@ -33,7 +33,7 @@ const V* FindEnumFromStringImpl(const char* key, const std::pair<const char*, V> for (size_t i = 0; i < arraySize; i++) if (entries[i].first && key && !strcmp(entries[i].first, key)) return &entries[i].second; - return nullptr; + return nullptr; } template <class K, class V> diff --git a/util/draft/holder_vector.h b/util/draft/holder_vector.h index 1c62055bd9..2df6c83476 100644 --- a/util/draft/holder_vector.h +++ b/util/draft/holder_vector.h @@ -67,7 +67,7 @@ public: T* Release(size_t i) { T* t = (*this)[i]; - (*this)[i] = nullptr; + (*this)[i] = nullptr; return t; } diff --git a/util/draft/holder_vector_ut.cpp b/util/draft/holder_vector_ut.cpp index f64393860a..9a7a4d0662 100644 --- a/util/draft/holder_vector_ut.cpp +++ b/util/draft/holder_vector_ut.cpp @@ -15,7 +15,7 @@ Y_UNIT_TEST_SUITE(THolderVectorTest) { UNIT_ASSERT(ints); for (size_t i = 0; i < ints.Size(); ++i) { - UNIT_ASSERT_EQUAL(ints[i], (int*)nullptr); + UNIT_ASSERT_EQUAL(ints[i], (int*)nullptr); } } @@ -34,9 +34,9 @@ Y_UNIT_TEST_SUITE(THolderVectorTest) { Y_UNIT_TEST(TestResetNoValue) { THolderVector<int> ints; ints.Resize(1); - UNIT_ASSERT_EQUAL(ints[0], (int*)nullptr); + UNIT_ASSERT_EQUAL(ints[0], (int*)nullptr); ints.Reset(0, MakeHolder<int>(1)); - UNIT_ASSERT_UNEQUAL(ints[0], (int*)nullptr); + UNIT_ASSERT_UNEQUAL(ints[0], (int*)nullptr); UNIT_ASSERT_VALUES_EQUAL(*ints[0], 1); } diff --git a/util/draft/matrix.h b/util/draft/matrix.h index 154d00b35e..b7dbb7268e 100644 --- a/util/draft/matrix.h +++ b/util/draft/matrix.h @@ -10,8 +10,8 @@ class TMatrix: TNonCopyable { // Constructor/Destructor public: TMatrix() - : Buf(nullptr) - , Arr(nullptr) + : Buf(nullptr) + , Arr(nullptr) , M(0) , N(0) , BufSize(0) @@ -28,7 +28,7 @@ public: } TMatrix(size_t m, size_t n, T* buf) - : Buf(nullptr) + : Buf(nullptr) , Arr(buf) , M(m) , N(n) diff --git a/util/folder/pathsplit.h b/util/folder/pathsplit.h index d134338e35..01d921995e 100644 --- a/util/folder/pathsplit.h +++ b/util/folder/pathsplit.h @@ -68,7 +68,7 @@ using TPathSplitTraitsLocal = TPathSplitTraitsWindows; template <class TTraits> class TPathSplitBase: public TTraits { public: - inline TPathSplitBase() = default; + inline TPathSplitBase() = default; inline TPathSplitBase(const TStringBuf part) { this->ParseFirstPart(part); diff --git a/util/generic/bitmap.h b/util/generic/bitmap.h index f77d182460..e0b3f0cd4a 100644 --- a/util/generic/bitmap.h +++ b/util/generic/bitmap.h @@ -347,7 +347,7 @@ public: } public: - ~TReference() = default; + ~TReference() = default; Y_FORCE_INLINE TReference& operator=(bool val) { if (val) @@ -416,14 +416,14 @@ private: } public: - TBitMapOps() = default; + TBitMapOps() = default; TBitMapOps(TChunk val) { Mask.Data[0] = val; Mask.Sanitize(); } - TBitMapOps(const TThis&) = default; + TBitMapOps(const TThis&) = default; template <class T> TBitMapOps(const TBitMapOps<T>& bitmap) @@ -1093,7 +1093,7 @@ public: { } - TBitMap(const TBitMap<BitCount, TChunkType>&) = default; + TBitMap(const TBitMap<BitCount, TChunkType>&) = default; template <class T> TBitMap(const TBitMapOps<T>& bitmap) diff --git a/util/generic/bitops.h b/util/generic/bitops.h index 2db15fc59b..bc4b5e5bbe 100644 --- a/util/generic/bitops.h +++ b/util/generic/bitops.h @@ -310,14 +310,14 @@ Y_FORCE_INLINE ui64 LeastSignificantBit(ui64 v) { } /* - * Returns 0 - based position of the most significant bit (compile time) - * 0 for 0. - */ -constexpr ui64 MostSignificantBitCT(ui64 x) { - return x > 1 ? 1 + MostSignificantBitCT(x >> 1) : 0; -} - -/* + * Returns 0 - based position of the most significant bit (compile time) + * 0 for 0. + */ +constexpr ui64 MostSignificantBitCT(ui64 x) { + return x > 1 ? 1 + MostSignificantBitCT(x >> 1) : 0; +} + +/* * Return rounded up binary logarithm of `x`. */ Y_FORCE_INLINE ui8 CeilLog2(ui64 x) { diff --git a/util/generic/bitops_ut.cpp b/util/generic/bitops_ut.cpp index d23c2b5c27..5a4fc0b433 100644 --- a/util/generic/bitops_ut.cpp +++ b/util/generic/bitops_ut.cpp @@ -85,7 +85,7 @@ Y_UNIT_TEST_SUITE(TBitOpsTest) { static_assert(MostSignificantBitCT(0) == 0, "."); static_assert(MostSignificantBitCT(1) == 0, "."); static_assert(MostSignificantBitCT(5) == 2, "."); - + for (ui32 i = 0; i < 64; ++i) { UNIT_ASSERT_VALUES_EQUAL(i, MostSignificantBit(ui64{1} << i)); } diff --git a/util/generic/cast_ut.cpp b/util/generic/cast_ut.cpp index 718a8de79d..2c759a561b 100644 --- a/util/generic/cast_ut.cpp +++ b/util/generic/cast_ut.cpp @@ -13,7 +13,7 @@ class TGenericCastsTest: public TTestBase { private: struct TAaa { - virtual ~TAaa() = default; + virtual ~TAaa() = default; }; struct TBbb: public TAaa {}; diff --git a/util/generic/flags_ut.cpp b/util/generic/flags_ut.cpp index 5377c6a058..63dacffab3 100644 --- a/util/generic/flags_ut.cpp +++ b/util/generic/flags_ut.cpp @@ -83,7 +83,7 @@ Y_UNIT_TEST_SUITE(TFlagsTest) { } Y_UNIT_TEST(TestOutput) { - ETest1 value0 = nullptr, value1 = Test1, value7 = Test1 | Test2 | Test4; + ETest1 value0 = nullptr, value1 = Test1, value7 = Test1 | Test2 | Test4; UNIT_ASSERT_VALUES_EQUAL(ToString(value0), "TFlags(0000000000000000)"); UNIT_ASSERT_VALUES_EQUAL(ToString(value1), "TFlags(0000000000000001)"); @@ -91,7 +91,7 @@ Y_UNIT_TEST_SUITE(TFlagsTest) { } Y_UNIT_TEST(TestHash) { - ETest1 value0 = nullptr, value1 = Test1; + ETest1 value0 = nullptr, value1 = Test1; THashMap<ETest1, int> hash; hash[value0] = 0; diff --git a/util/generic/hash.h b/util/generic/hash.h index e46db21fa9..33fff78e08 100644 --- a/util/generic/hash.h +++ b/util/generic/hash.h @@ -97,7 +97,7 @@ struct __yhashtable_iterator { return !cur; } Y_FORCE_INLINE explicit operator bool() const noexcept { - return cur != nullptr; + return cur != nullptr; } }; @@ -144,7 +144,7 @@ struct __yhashtable_const_iterator { return !cur; } Y_FORCE_INLINE explicit operator bool() const noexcept { - return cur != nullptr; + return cur != nullptr; } }; @@ -1242,9 +1242,9 @@ void THashTable<V, K, HF, Ex, Eq, A>::erase(iterator first, iterator last) { else if (f_bucket == l_bucket) erase_bucket(f_bucket, first.cur, last.cur); else { - erase_bucket(f_bucket, first.cur, nullptr); + erase_bucket(f_bucket, first.cur, nullptr); for (size_type n = f_bucket + 1; n < l_bucket; ++n) - erase_bucket(n, nullptr); + erase_bucket(n, nullptr); if (l_bucket != buckets.size()) /*y*/ erase_bucket(l_bucket, last.cur); } @@ -1322,7 +1322,7 @@ void THashTable<V, K, HF, Ex, Eq, A>::erase_bucket(const size_type n, node* firs while (next != last) { /*y; 3.1*/ cur->next = next->next; delete_node(next); - next = ((uintptr_t)cur->next & 1) ? nullptr : cur->next; /*y*/ + next = ((uintptr_t)cur->next & 1) ? nullptr : cur->next; /*y*/ --num_elements; } } @@ -1334,7 +1334,7 @@ void THashTable<V, K, HF, Ex, Eq, A>::erase_bucket(const size_type n, node* last while (cur != last) { node* next = cur->next; delete_node(cur); - cur = ((uintptr_t)next & 1) ? nullptr : next; /*y*/ + cur = ((uintptr_t)next & 1) ? nullptr : next; /*y*/ buckets[n] = cur; --num_elements; } diff --git a/util/generic/intrlist.h b/util/generic/intrlist.h index b5d3f2051b..e8c17df072 100644 --- a/util/generic/intrlist.h +++ b/util/generic/intrlist.h @@ -229,7 +229,7 @@ private: using reference = typename TIterator::reference; using pointer = typename TIterator::pointer; - inline TReverseIteratorBase() noexcept = default; + inline TReverseIteratorBase() noexcept = default; template <class TIterator_> inline TReverseIteratorBase(const TReverseIteratorBase<TIterator_>& right) noexcept @@ -340,7 +340,7 @@ public: } public: - inline TIntrusiveList() noexcept = default; + inline TIntrusiveList() noexcept = default; inline ~TIntrusiveList() = default; @@ -600,7 +600,7 @@ public: using const_reverse_iterator = TConstReverseIterator; public: - inline TIntrusiveListWithAutoDelete() noexcept = default; + inline TIntrusiveListWithAutoDelete() noexcept = default; inline TIntrusiveListWithAutoDelete(TIntrusiveListWithAutoDelete&& right) noexcept : TIntrusiveList<T, Tag>(std::move(right)) @@ -647,7 +647,7 @@ public: { } - inline ~TIntrusiveSListItem() = default; + inline ~TIntrusiveSListItem() = default; inline bool IsEnd() const noexcept { return Next_ == nullptr; diff --git a/util/generic/maybe.h b/util/generic/maybe.h index 34d21aebcd..ae06f836e5 100644 --- a/util/generic/maybe.h +++ b/util/generic/maybe.h @@ -306,11 +306,11 @@ public: } const T* Get() const noexcept { - return Defined() ? Data() : nullptr; + return Defined() ? Data() : nullptr; } T* Get() noexcept { - return Defined() ? Data() : nullptr; + return Defined() ? Data() : nullptr; } constexpr const T& GetRef() const& { diff --git a/util/generic/ptr.cpp b/util/generic/ptr.cpp index b29baebc17..3109929a21 100644 --- a/util/generic/ptr.cpp +++ b/util/generic/ptr.cpp @@ -14,4 +14,4 @@ void TDelete::Destroy(void* t) noexcept { ::operator delete(t); } -TThrRefBase::~TThrRefBase() = default; +TThrRefBase::~TThrRefBase() = default; diff --git a/util/generic/ptr.h b/util/generic/ptr.h index 19db0e3ec5..21b2e3cecb 100644 --- a/util/generic/ptr.h +++ b/util/generic/ptr.h @@ -201,7 +201,7 @@ public: } inline void Destroy() noexcept { - Reset(nullptr); + Reset(nullptr); } inline void Swap(TAutoPtr& r) noexcept { @@ -363,7 +363,7 @@ public: { } - inline ~TRefCounted() = default; + inline ~TRefCounted() = default; inline void Ref(TAtomicBase d) noexcept { auto resultCount = Counter_.Add(d); @@ -563,14 +563,14 @@ public: } inline void Drop() noexcept { - TIntrusivePtr(nullptr).Swap(*this); + TIntrusivePtr(nullptr).Swap(*this); } inline T* Release() const noexcept Y_WARN_UNUSED_RESULT { T* res = T_; if (T_) { Ops::DecRef(T_); - T_ = nullptr; + T_ = nullptr; } return res; } @@ -745,7 +745,7 @@ public: InitStaticOps(); } - inline ~TSimpleIntrusiveOps() = default; + inline ~TSimpleIntrusiveOps() = default; static inline void Ref(T* t) noexcept { Ref_(t); @@ -1060,7 +1060,7 @@ class TCowPtr: public TPointerBase<TCowPtr<TPtr, TCopy>, const typename TPtr::TV using T = typename TPtr::TValueType; public: - inline TCowPtr() = default; + inline TCowPtr() = default; inline TCowPtr(const TPtr& p) : T_(p) diff --git a/util/generic/ptr_ut.cpp b/util/generic/ptr_ut.cpp index c2dcff23f6..68469ee10f 100644 --- a/util/generic/ptr_ut.cpp +++ b/util/generic/ptr_ut.cpp @@ -166,7 +166,7 @@ void TPointerTest::TestHolderPtrMoveAssignment() { } struct TBase { - virtual ~TBase() = default; + virtual ~TBase() = default; }; struct TDerived: public TBase { @@ -319,7 +319,7 @@ public: { ++Cnt; } - ~TOp2() override { + ~TOp2() override { --Cnt; } }; diff --git a/util/generic/refcount.h b/util/generic/refcount.h index 966e853b77..659c07873d 100644 --- a/util/generic/refcount.h +++ b/util/generic/refcount.h @@ -107,7 +107,7 @@ public: { } - inline ~TAtomicCounter() = default; + inline ~TAtomicCounter() = default; inline TAtomicBase Add(TAtomicBase d) noexcept { return AtomicAdd(Counter_, d); diff --git a/util/generic/utility.h b/util/generic/utility.h index 43b98eeafc..37a87e222b 100644 --- a/util/generic/utility.h +++ b/util/generic/utility.h @@ -24,7 +24,7 @@ static constexpr const T& Max(const T& a, const T& b, const Args&... args) { return Max(a, Max(b, args...)); } -// replace with http://en.cppreference.com/w/cpp/algorithm/clamp in c++17 +// replace with http://en.cppreference.com/w/cpp/algorithm/clamp in c++17 template <class T> constexpr const T& ClampVal(const T& val, const T& min, const T& max) { return val < min ? min : (max < val ? max : val); @@ -44,7 +44,7 @@ static T Mean(const Args&... other) noexcept { template <class T> static inline void Zero(T& t) noexcept { - memset((void*)&t, 0, sizeof(t)); + memset((void*)&t, 0, sizeof(t)); } /** diff --git a/util/memory/addstorage.h b/util/memory/addstorage.h index 597c73a988..ff5a3e14f5 100644 --- a/util/memory/addstorage.h +++ b/util/memory/addstorage.h @@ -27,9 +27,9 @@ class alignas(::NPrivate::TAdditionalStorageInfo) TAdditionalStorage { using TInfo = ::NPrivate::TAdditionalStorageInfo; public: - inline TAdditionalStorage() noexcept = default; + inline TAdditionalStorage() noexcept = default; - inline ~TAdditionalStorage() = default; + inline ~TAdditionalStorage() = default; inline void* operator new(size_t len1, size_t len2) { static_assert(alignof(T) >= alignof(TInfo)); diff --git a/util/memory/alloc.h b/util/memory/alloc.h index d59575aef5..0edf818fd2 100644 --- a/util/memory/alloc.h +++ b/util/memory/alloc.h @@ -12,7 +12,7 @@ public: size_t Len; }; - virtual ~IAllocator() = default; + virtual ~IAllocator() = default; virtual TBlock Allocate(size_t len) = 0; virtual void Release(const TBlock& block) = 0; @@ -20,8 +20,8 @@ public: class TDefaultAllocator: public IAllocator { public: - TBlock Allocate(size_t len) override; - void Release(const TBlock& block) override; + TBlock Allocate(size_t len) override; + void Release(const TBlock& block) override; static IAllocator* Instance() noexcept; }; diff --git a/util/memory/blob.cpp b/util/memory/blob.cpp index 91da5cadca..4262188c40 100644 --- a/util/memory/blob.cpp +++ b/util/memory/blob.cpp @@ -19,9 +19,9 @@ class TDynamicBlobBase: public TBlob::TBase, using TRefBase = TRefCounted<TDynamicBlobBase, TCounter>; public: - inline TDynamicBlobBase() = default; + inline TDynamicBlobBase() = default; - ~TDynamicBlobBase() override = default; + ~TDynamicBlobBase() override = default; void Ref() noexcept override { TRefBase::Ref(); @@ -49,7 +49,7 @@ public: Buf_.Swap(buf); } - ~TBufferBlobBase() override = default; + ~TBufferBlobBase() override = default; void Ref() noexcept override { TRefBase::Ref(); @@ -82,7 +82,7 @@ public: { } - ~TStringBlobBase() override = default; + ~TStringBlobBase() override = default; void Ref() noexcept override { TRefBase::Ref(); diff --git a/util/memory/blob.h b/util/memory/blob.h index 20c02a68df..148f05afd9 100644 --- a/util/memory/blob.h +++ b/util/memory/blob.h @@ -25,8 +25,8 @@ class TBlob { public: class TBase { public: - inline TBase() noexcept = default; - virtual ~TBase() = default; + inline TBase() noexcept = default; + virtual ~TBase() = default; virtual void Ref() noexcept = 0; virtual void UnRef() noexcept = 0; @@ -45,7 +45,7 @@ private: { } - inline ~TStorage() = default; + inline ~TStorage() = default; inline void Swap(TStorage& r) noexcept { DoSwap(Data, r.Data); diff --git a/util/memory/mmapalloc.cpp b/util/memory/mmapalloc.cpp index ec618cc808..52a99db308 100644 --- a/util/memory/mmapalloc.cpp +++ b/util/memory/mmapalloc.cpp @@ -7,7 +7,7 @@ namespace { class TMmapAllocator: public IAllocator { public: - TBlock Allocate(size_t len) override { + TBlock Allocate(size_t len) override { TMappedAllocation m(len + sizeof(TMappedAllocation)); TMappedAllocation* real = (TMappedAllocation*)m.Data(); @@ -18,7 +18,7 @@ namespace { return ret; } - void Release(const TBlock& block) override { + void Release(const TBlock& block) override { TMappedAllocation tmp(0); TMappedAllocation* real = ((TMappedAllocation*)block.Data) - 1; diff --git a/util/memory/pool.h b/util/memory/pool.h index 13c8b6b9ed..1e86b79c0f 100644 --- a/util/memory/pool.h +++ b/util/memory/pool.h @@ -100,7 +100,7 @@ private: public: class IGrowPolicy { public: - virtual ~IGrowPolicy() = default; + virtual ~IGrowPolicy() = default; virtual size_t Next(size_t prev) const noexcept = 0; }; @@ -336,13 +336,13 @@ public: { } - TBlock Allocate(size_t len) override { + TBlock Allocate(size_t len) override { TBlock ret = {Pool_->Allocate(len), len}; return ret; } - void Release(const TBlock& block) override { + void Release(const TBlock& block) override { (void)block; } diff --git a/util/memory/pool_ut.cpp b/util/memory/pool_ut.cpp index 1158a8ca42..bbfdfd08f3 100644 --- a/util/memory/pool_ut.cpp +++ b/util/memory/pool_ut.cpp @@ -14,7 +14,7 @@ public: { } - TBlock Allocate(size_t len) override { + TBlock Allocate(size_t len) override { Check(); Alloced_ += len; @@ -23,7 +23,7 @@ public: return TDefaultAllocator::Allocate(len); } - void Release(const TBlock& block) override { + void Release(const TBlock& block) override { Released_ += block.Len; ++Frees_; diff --git a/util/memory/segpool_alloc.h b/util/memory/segpool_alloc.h index 1a83b7a543..d3838c28db 100644 --- a/util/memory/segpool_alloc.h +++ b/util/memory/segpool_alloc.h @@ -43,7 +43,7 @@ struct segpool_alloc { ui64 pool_count, malloc_count, pool_free_count, malloc_free_count; #endif segpool_alloc() - : pool(nullptr) + : pool(nullptr) { Y_IF_DEBUG(pool_count = malloc_count = pool_free_count = malloc_free_count = 0); } @@ -69,7 +69,7 @@ struct segpool_alloc { Y_IF_DEBUG(if (data) malloc_count++); return data; } - _Tp* data = (_Tp*)pool->append(nullptr, __n * sizeof(_Tp)); + _Tp* data = (_Tp*)pool->append(nullptr, __n * sizeof(_Tp)); Y_IF_DEBUG(pool_count++); return data; } diff --git a/util/memory/tempbuf.cpp b/util/memory/tempbuf.cpp index 09a2d0f140..fd288d41c3 100644 --- a/util/memory/tempbuf.cpp +++ b/util/memory/tempbuf.cpp @@ -27,7 +27,7 @@ public: * We do not really need 'virtual' here * but for compiler happiness... */ - virtual ~TImpl() = default; + virtual ~TImpl() = default; inline void* Data() noexcept { return Data_; @@ -87,7 +87,7 @@ namespace { { } - inline ~TAllocedBuf() override = default; + inline ~TAllocedBuf() override = default; private: void Dispose() noexcept override { @@ -105,7 +105,7 @@ namespace { { } - inline ~TPerThreadedBuf() override = default; + inline ~TPerThreadedBuf() override = default; private: void Dispose() noexcept override; @@ -194,14 +194,14 @@ TTempBuf::TTempBuf(size_t len) { } -TTempBuf::TTempBuf(const TTempBuf&) noexcept = default; +TTempBuf::TTempBuf(const TTempBuf&) noexcept = default; TTempBuf::TTempBuf(TTempBuf&& b) noexcept : Impl_(std::move(b.Impl_)) { } -TTempBuf::~TTempBuf() = default; +TTempBuf::~TTempBuf() = default; TTempBuf& TTempBuf::operator=(const TTempBuf& b) noexcept { if (this != &b) { diff --git a/util/memory/tempbuf.h b/util/memory/tempbuf.h index 334670eb1e..536bb8b0e0 100644 --- a/util/memory/tempbuf.h +++ b/util/memory/tempbuf.h @@ -67,7 +67,7 @@ private: } public: - TTempArray() = default; + TTempArray() = default; TTempArray(size_t len) : TTempBuf(RawSize(len)) diff --git a/util/network/address.h b/util/network/address.h index 448fcac0c9..e85c495510 100644 --- a/util/network/address.h +++ b/util/network/address.h @@ -9,7 +9,7 @@ namespace NAddr { class IRemoteAddr { public: - virtual ~IRemoteAddr() = default; + virtual ~IRemoteAddr() = default; virtual const sockaddr* Addr() const = 0; virtual socklen_t Len() const = 0; @@ -47,11 +47,11 @@ namespace NAddr { Assign(addr, SockAddrLength(addr)); } - const sockaddr* Addr() const override { + const sockaddr* Addr() const override { return MutableAddr(); } - socklen_t Len() const override { + socklen_t Len() const override { return L_; } @@ -82,11 +82,11 @@ namespace NAddr { { } - const sockaddr* Addr() const override { + const sockaddr* Addr() const override { return AI_->ai_addr; } - socklen_t Len() const override { + socklen_t Len() const override { return (socklen_t)AI_->ai_addrlen; } @@ -102,11 +102,11 @@ namespace NAddr { { } - const sockaddr* Addr() const override { + const sockaddr* Addr() const override { return A_; } - socklen_t Len() const override { + socklen_t Len() const override { return A_; } @@ -122,11 +122,11 @@ namespace NAddr { { } - const sockaddr* Addr() const override { + const sockaddr* Addr() const override { return (sockaddr*)&A_; } - socklen_t Len() const override { + socklen_t Len() const override { return sizeof(A_); } diff --git a/util/network/poller.cpp b/util/network/poller.cpp index 7954d0e8b5..628f0f0fe0 100644 --- a/util/network/poller.cpp +++ b/util/network/poller.cpp @@ -39,7 +39,7 @@ TSocketPoller::TSocketPoller() { } -TSocketPoller::~TSocketPoller() = default; +TSocketPoller::~TSocketPoller() = default; void TSocketPoller::WaitRead(SOCKET sock, void* cookie) { Impl_->Set(cookie, sock, CONT_POLL_READ); diff --git a/util/network/sock.h b/util/network/sock.h index b10be2f715..8a2a1c5686 100644 --- a/util/network/sock.h +++ b/util/network/sock.h @@ -152,11 +152,11 @@ struct TSockAddrLocal: public sockaddr_un, public ISockAddr { Set(path); } - socklen_t Size() const override { + socklen_t Size() const override { return sizeof(sockaddr_un); } - socklen_t Len() const override { + socklen_t Len() const override { return strlen(sun_path) + 2; } @@ -170,11 +170,11 @@ struct TSockAddrLocal: public sockaddr_un, public ISockAddr { strlcpy(sun_path, path, sizeof(sun_path)); } - sockaddr* SockAddr() override { + sockaddr* SockAddr() override { return (struct sockaddr*)(struct sockaddr_un*)this; } - const sockaddr* SockAddr() const override { + const sockaddr* SockAddr() const override { return (const struct sockaddr*)(const struct sockaddr_un*)this; } @@ -186,7 +186,7 @@ struct TSockAddrLocal: public sockaddr_un, public ISockAddr { return TFsPath(sun_path); } - int Bind(SOCKET s, ui16 mode) const override { + int Bind(SOCKET s, ui16 mode) const override { (void)unlink(sun_path); int ret = bind(s, SockAddr(), Len()); @@ -214,11 +214,11 @@ struct TSockAddrInet: public sockaddr_in, public ISockAddr { Set(IpFromString(ip), port); } - socklen_t Size() const override { + socklen_t Size() const override { return sizeof(sockaddr_in); } - socklen_t Len() const override { + socklen_t Len() const override { return Size(); } @@ -233,11 +233,11 @@ struct TSockAddrInet: public sockaddr_in, public ISockAddr { sin_port = HostToInet(port); } - sockaddr* SockAddr() override { + sockaddr* SockAddr() override { return (struct sockaddr*)(struct sockaddr_in*)this; } - const sockaddr* SockAddr() const override { + const sockaddr* SockAddr() const override { return (const struct sockaddr*)(const struct sockaddr_in*)this; } @@ -245,7 +245,7 @@ struct TSockAddrInet: public sockaddr_in, public ISockAddr { return IpToString(sin_addr.s_addr) + ":" + ::ToString(InetToHost(sin_port)); } - int Bind(SOCKET s, ui16 mode) const override { + int Bind(SOCKET s, ui16 mode) const override { Y_UNUSED(mode); int ret = bind(s, SockAddr(), Len()); if (ret < 0) @@ -280,11 +280,11 @@ struct TSockAddrInet6: public sockaddr_in6, public ISockAddr { Set(ip6, port); } - socklen_t Size() const override { + socklen_t Size() const override { return sizeof(sockaddr_in6); } - socklen_t Len() const override { + socklen_t Len() const override { return Size(); } @@ -299,11 +299,11 @@ struct TSockAddrInet6: public sockaddr_in6, public ISockAddr { sin6_port = HostToInet(port); } - sockaddr* SockAddr() override { + sockaddr* SockAddr() override { return (struct sockaddr*)(struct sockaddr_in6*)this; } - const sockaddr* SockAddr() const override { + const sockaddr* SockAddr() const override { return (const struct sockaddr*)(const struct sockaddr_in6*)this; } @@ -311,7 +311,7 @@ struct TSockAddrInet6: public sockaddr_in6, public ISockAddr { return "[" + GetIp() + "]:" + ::ToString(InetToHost(sin6_port)); } - int Bind(SOCKET s, ui16 mode) const override { + int Bind(SOCKET s, ui16 mode) const override { Y_UNUSED(mode); int ret = bind(s, SockAddr(), Len()); if (ret < 0) { @@ -561,7 +561,7 @@ public: protected: TStreamSocket* Socket; - size_t DoRead(void* buf, size_t len) override { + size_t DoRead(void* buf, size_t len) override { Y_VERIFY(Socket, "TStreamSocketInput: socket isn't set"); const ssize_t ret = Socket->Recv(buf, len); @@ -589,7 +589,7 @@ public: protected: TStreamSocket* Socket; - void DoWrite(const void* buf, size_t len) override { + void DoWrite(const void* buf, size_t len) override { Y_VERIFY(Socket, "TStreamSocketOutput: socket isn't set"); const char* ptr = (const char*)buf; diff --git a/util/network/socket.cpp b/util/network/socket.cpp index 4f6e804346..9b53e883a2 100644 --- a/util/network/socket.cpp +++ b/util/network/socket.cpp @@ -583,7 +583,7 @@ public: { } - inline ~TImpl() = default; + inline ~TImpl() = default; inline SOCKET Fd() const noexcept { return Fd_; @@ -755,9 +755,9 @@ public: inline TCommonSockOps() noexcept { } - ~TCommonSockOps() override = default; + ~TCommonSockOps() override = default; - ssize_t Send(SOCKET fd, const void* data, size_t len) override { + ssize_t Send(SOCKET fd, const void* data, size_t len) override { ssize_t ret = -1; do { ret = send(fd, (const char*)data, (int)len, MSG_NOSIGNAL); @@ -770,7 +770,7 @@ public: return ret; } - ssize_t Recv(SOCKET fd, void* buf, size_t len) override { + ssize_t Recv(SOCKET fd, void* buf, size_t len) override { ssize_t ret = -1; do { ret = recv(fd, (char*)buf, (int)len, 0); @@ -783,7 +783,7 @@ public: return ret; } - ssize_t SendV(SOCKET fd, const TPart* parts, size_t count) override { + ssize_t SendV(SOCKET fd, const TPart* parts, size_t count) override { ssize_t ret = SendVImpl(fd, parts, count); if (ret < 0) { @@ -866,7 +866,7 @@ TSocket::TSocket(const TNetworkAddress& addr, const TInstant& deadLine) { } -TSocket::~TSocket() = default; +TSocket::~TSocket() = default; SOCKET TSocket::Fd() const noexcept { return Impl_->Fd(); @@ -893,7 +893,7 @@ TSocketInput::TSocketInput(const TSocket& s) noexcept { } -TSocketInput::~TSocketInput() = default; +TSocketInput::~TSocketInput() = default; size_t TSocketInput::DoRead(void* buf, size_t len) { const ssize_t ret = S_.Recv(buf, len); @@ -1084,7 +1084,7 @@ TNetworkAddress::TNetworkAddress(ui16 port) { } -TNetworkAddress::~TNetworkAddress() = default; +TNetworkAddress::~TNetworkAddress() = default; struct addrinfo* TNetworkAddress::Info() const noexcept { return Impl_->Info(); diff --git a/util/network/socket.h b/util/network/socket.h index 40c8648b40..521b55a8ee 100644 --- a/util/network/socket.h +++ b/util/network/socket.h @@ -301,8 +301,8 @@ public: class TOps { public: - inline TOps() noexcept = default; - virtual ~TOps() = default; + inline TOps() noexcept = default; + virtual ~TOps() = default; virtual ssize_t Send(SOCKET fd, const void* data, size_t len) = 0; virtual ssize_t Recv(SOCKET fd, void* buf, size_t len) = 0; @@ -402,7 +402,7 @@ public: } private: - size_t DoRead(void* buf, size_t len) override; + size_t DoRead(void* buf, size_t len) override; private: TSocket S_; @@ -421,8 +421,8 @@ public: } private: - void DoWrite(const void* buf, size_t len) override; - void DoWriteV(const TPart* parts, size_t count) override; + void DoWrite(const void* buf, size_t len) override; + void DoWriteV(const TPart* parts, size_t count) override; private: TSocket S_; diff --git a/util/random/entropy.cpp b/util/random/entropy.cpp index 3617edb83d..760dabfee1 100644 --- a/util/random/entropy.cpp +++ b/util/random/entropy.cpp @@ -112,9 +112,9 @@ namespace { { } - ~TMersenneInput() override = default; + ~TMersenneInput() override = default; - size_t DoRead(void* buf, size_t len) override { + size_t DoRead(void* buf, size_t len) override { size_t toRead = len; while (toRead) { @@ -142,7 +142,7 @@ namespace { { } - size_t DoRead(void* buf, size_t len) override { + size_t DoRead(void* buf, size_t len) override { auto guard = Guard(Mutex_); return Bi_.Read(buf, len); @@ -155,7 +155,7 @@ namespace { }; struct TSeedStream: public IInputStream { - size_t DoRead(void* inbuf, size_t len) override { + size_t DoRead(void* inbuf, size_t len) override { char* buf = (char*)inbuf; #define DO_STEP(type) \ diff --git a/util/stream/aligned.h b/util/stream/aligned.h index 70e7be05a9..81203f71e3 100644 --- a/util/stream/aligned.h +++ b/util/stream/aligned.h @@ -42,8 +42,8 @@ public: } private: - size_t DoRead(void* ptr, size_t len) override; - size_t DoSkip(size_t len) override; + size_t DoRead(void* ptr, size_t len) override; + size_t DoSkip(size_t len) override; size_t DoReadTo(TString& st, char ch) override; ui64 DoReadAll(IOutputStream& out) override; @@ -89,7 +89,7 @@ public: } private: - void DoWrite(const void* ptr, size_t len) override; + void DoWrite(const void* ptr, size_t len) override; private: IOutputStream* Stream_; diff --git a/util/stream/aligned_ut.cpp b/util/stream/aligned_ut.cpp index e980d05cf7..8ff512fc7c 100644 --- a/util/stream/aligned_ut.cpp +++ b/util/stream/aligned_ut.cpp @@ -10,7 +10,7 @@ public: } protected: - size_t DoRead(void* buf, size_t len) override { + size_t DoRead(void* buf, size_t len) override { if (len == 0) { return 0; } @@ -20,7 +20,7 @@ protected: return 1; } - size_t DoSkip(size_t len) override { + size_t DoSkip(size_t len) override { if (len == 0) { return 0; } diff --git a/util/stream/buffer.cpp b/util/stream/buffer.cpp index 2facece4ea..e3ecbacb03 100644 --- a/util/stream/buffer.cpp +++ b/util/stream/buffer.cpp @@ -9,7 +9,7 @@ public: { } - virtual ~TImpl() = default; + virtual ~TImpl() = default; inline size_t DoNext(void** ptr) { if (Data_.Avail() == 0) { @@ -69,7 +69,7 @@ TBufferOutput::TBufferOutput(TBuffer& buffer) TBufferOutput::TBufferOutput(TBufferOutput&&) noexcept = default; TBufferOutput& TBufferOutput::operator=(TBufferOutput&&) noexcept = default; -TBufferOutput::~TBufferOutput() = default; +TBufferOutput::~TBufferOutput() = default; TBuffer& TBufferOutput::Buffer() const noexcept { return Impl_->Buffer(); @@ -97,7 +97,7 @@ TBufferInput::TBufferInput(const TBuffer& buffer) { } -TBufferInput::~TBufferInput() = default; +TBufferInput::~TBufferInput() = default; const TBuffer& TBufferInput::Buffer() const noexcept { return Buf_; diff --git a/util/stream/buffer.h b/util/stream/buffer.h index 9dc99dbe49..68cd7af4e0 100644 --- a/util/stream/buffer.h +++ b/util/stream/buffer.h @@ -48,7 +48,7 @@ public: private: size_t DoNext(void** ptr) override; void DoUndo(size_t len) override; - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; void DoWriteC(char c) override; private: @@ -76,7 +76,7 @@ public: void Rewind() noexcept; protected: - size_t DoNext(const void** ptr, size_t len) override; + size_t DoNext(const void** ptr, size_t len) override; void DoUndo(size_t len) override; private: @@ -111,7 +111,7 @@ public: { } - ~TBufferStream() override = default; + ~TBufferStream() override = default; using TBufferOutput::Buffer; }; diff --git a/util/stream/buffered.cpp b/util/stream/buffered.cpp index a00e592e1c..6a2e72fd76 100644 --- a/util/stream/buffered.cpp +++ b/util/stream/buffered.cpp @@ -13,7 +13,7 @@ public: { } - inline ~TImpl() = default; + inline ~TImpl() = default; inline size_t Next(const void** ptr, size_t len) { if (MemInput_.Exhausted()) { @@ -125,7 +125,7 @@ TBufferedInput::TBufferedInput(IInputStream* slave, size_t buflen) TBufferedInput::TBufferedInput(TBufferedInput&&) noexcept = default; TBufferedInput& TBufferedInput::operator=(TBufferedInput&&) noexcept = default; -TBufferedInput::~TBufferedInput() = default; +TBufferedInput::~TBufferedInput() = default; size_t TBufferedInput::DoRead(void* buf, size_t len) { return Impl_->Read(buf, len); @@ -157,7 +157,7 @@ public: { } - virtual ~TImpl() = default; + virtual ~TImpl() = default; inline void Reset() { MemOut_.Reset(Buf(), Len()); @@ -296,9 +296,9 @@ namespace { Reset(); } - ~TSimpleImpl() override = default; + ~TSimpleImpl() override = default; - void OnBufferExhausted() final { + void OnBufferExhausted() final { } void* Buf() const noexcept override { @@ -323,9 +323,9 @@ namespace { Reset(); } - ~TAdaptiveImpl() override = default; + ~TAdaptiveImpl() override = default; - void OnBufferExhausted() final { + void OnBufferExhausted() final { const size_t c = ((size_t)Step) << Min<size_t>(++N_ / 32, 10); if (c > B_.Capacity()) { @@ -418,11 +418,11 @@ TBufferedOutput::TBufferedOutput(IOutputStream* slave, size_t buflen) { } -TBufferedOutput::~TBufferedOutput() = default; +TBufferedOutput::~TBufferedOutput() = default; TAdaptiveBufferedOutput::TAdaptiveBufferedOutput(IOutputStream* slave) : TBufferedOutputBase(slave) { } -TAdaptiveBufferedOutput::~TAdaptiveBufferedOutput() = default; +TAdaptiveBufferedOutput::~TAdaptiveBufferedOutput() = default; diff --git a/util/stream/buffered.h b/util/stream/buffered.h index 0847186141..005f482979 100644 --- a/util/stream/buffered.h +++ b/util/stream/buffered.h @@ -38,10 +38,10 @@ public: void Reset(IInputStream* slave); protected: - size_t DoRead(void* buf, size_t len) override; + size_t DoRead(void* buf, size_t len) override; size_t DoReadTo(TString& st, char ch) override; - size_t DoSkip(size_t len) override; - size_t DoNext(const void** ptr, size_t len) override; + size_t DoSkip(size_t len) override; + size_t DoNext(const void** ptr, size_t len) override; private: class TImpl; @@ -113,10 +113,10 @@ public: protected: size_t DoNext(void** ptr) override; void DoUndo(size_t len) override; - void DoWrite(const void* data, size_t len) override; + void DoWrite(const void* data, size_t len) override; void DoWriteC(char c) override; - void DoFlush() override; - void DoFinish() override; + void DoFlush() override; + void DoFinish() override; private: THolder<TImpl> Impl_; diff --git a/util/stream/debug.h b/util/stream/debug.h index 92d6d4b42d..0407cd6a73 100644 --- a/util/stream/debug.h +++ b/util/stream/debug.h @@ -13,13 +13,13 @@ class TDebugOutput: public IOutputStream { public: inline TDebugOutput() noexcept = default; - ~TDebugOutput() override = default; + ~TDebugOutput() override = default; TDebugOutput(TDebugOutput&&) noexcept = default; TDebugOutput& operator=(TDebugOutput&&) noexcept = default; private: - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; }; /** diff --git a/util/stream/direct_io.h b/util/stream/direct_io.h index 2e1f2e07dd..53130e7a12 100644 --- a/util/stream/direct_io.h +++ b/util/stream/direct_io.h @@ -9,8 +9,8 @@ public: TRandomAccessFileInput(TDirectIOBufferedFile& file, ui64 position); protected: - size_t DoRead(void* buf, size_t len) override; - size_t DoSkip(size_t len) override; + size_t DoRead(void* buf, size_t len) override; + size_t DoSkip(size_t len) override; private: TDirectIOBufferedFile& File; @@ -28,8 +28,8 @@ protected: TDirectIOBufferedFile* File; private: - void DoWrite(const void* buf, size_t len) override; - void DoFlush() override; + void DoWrite(const void* buf, size_t len) override; + void DoFlush() override; }; class TBufferedFileOutputEx: public TRandomAccessFileOutput { @@ -37,7 +37,7 @@ public: TBufferedFileOutputEx(const TString& path, EOpenMode oMode, size_t buflen = 1 << 17); private: - void DoFlush() override; - void DoFinish() override; + void DoFlush() override; + void DoFinish() override; THolder<TDirectIOBufferedFile> FileHolder; }; diff --git a/util/stream/file.cpp b/util/stream/file.cpp index dc5d2f6311..3cae1fbaac 100644 --- a/util/stream/file.cpp +++ b/util/stream/file.cpp @@ -77,7 +77,7 @@ public: { } - inline ~TImpl() = default; + inline ~TImpl() = default; }; TMappedFileInput::TMappedFileInput(const TFile& file) @@ -94,4 +94,4 @@ TMappedFileInput::TMappedFileInput(const TString& path) Reset(Impl_->Data(), Impl_->Size()); } -TMappedFileInput::~TMappedFileInput() = default; +TMappedFileInput::~TMappedFileInput() = default; diff --git a/util/stream/file.h b/util/stream/file.h index c1cf4f591d..ec4d91a2b1 100644 --- a/util/stream/file.h +++ b/util/stream/file.h @@ -26,8 +26,8 @@ public: TUnbufferedFileInput(const TString& path); private: - size_t DoRead(void* buf, size_t len) override; - size_t DoSkip(size_t len) override; + size_t DoRead(void* buf, size_t len) override; + size_t DoSkip(size_t len) override; private: TFile File_; @@ -63,8 +63,8 @@ public: TUnbufferedFileOutput& operator=(TUnbufferedFileOutput&&) noexcept = default; private: - void DoWrite(const void* buf, size_t len) override; - void DoFlush() override; + void DoWrite(const void* buf, size_t len) override; + void DoFlush() override; private: TFile File_; diff --git a/util/stream/format_ut.cpp b/util/stream/format_ut.cpp index 43245aeb48..22fd3d71f9 100644 --- a/util/stream/format_ut.cpp +++ b/util/stream/format_ut.cpp @@ -61,15 +61,15 @@ Y_UNIT_TEST_SUITE(TOutputStreamFormattingTest) { } Y_UNIT_TEST(TestBin) { - UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui32>(2), nullptr)), "10"); - UNIT_ASSERT_VALUES_EQUAL(ToString(SBin(static_cast<i32>(-2), nullptr)), "-10"); + UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui32>(2), nullptr)), "10"); + UNIT_ASSERT_VALUES_EQUAL(ToString(SBin(static_cast<i32>(-2), nullptr)), "-10"); UNIT_ASSERT_VALUES_EQUAL(ToString(SBin(static_cast<i32>(-2))), "-0b00000000000000000000000000000010"); UNIT_ASSERT_VALUES_EQUAL(ToString(SBin(static_cast<i32>(-2), HF_FULL)), "-00000000000000000000000000000010"); - UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui32>(15), nullptr)), "1111"); + UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui32>(15), nullptr)), "1111"); UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui32>(1))), "0b00000000000000000000000000000001"); UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui32>(-1))), "0b11111111111111111111111111111111"); UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<i32>(-1))), "0b11111111111111111111111111111111"); - UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<i32>(-1), nullptr)), "11111111111111111111111111111111"); + UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<i32>(-1), nullptr)), "11111111111111111111111111111111"); UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui32>(256))), "0b00000000000000000000000100000000"); UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui8>(16))), "0b00010000"); UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui64>(1234587912357ull))), "0b0000000000000000000000010001111101110011001011001000100010100101"); diff --git a/util/stream/input.cpp b/util/stream/input.cpp index 6e8170f2f9..5877d2a910 100644 --- a/util/stream/input.cpp +++ b/util/stream/input.cpp @@ -164,9 +164,9 @@ ui64 TransferData(IInputStream* in, IOutputStream* out) { namespace { struct TStdIn: public IInputStream { - ~TStdIn() override = default; + ~TStdIn() override = default; - size_t DoRead(void* buf, size_t len) override { + size_t DoRead(void* buf, size_t len) override { const size_t ret = fread(buf, 1, len, F_); if (ret < len && ferror(F_)) { diff --git a/util/stream/input_ut.cpp b/util/stream/input_ut.cpp index 4a93f5458e..c78b1e244e 100644 --- a/util/stream/input_ut.cpp +++ b/util/stream/input_ut.cpp @@ -49,7 +49,7 @@ public: } protected: - size_t DoRead(void*, size_t len) override { + size_t DoRead(void*, size_t len) override { len = Min(static_cast<ui64>(len), Size_); Size_ -= len; return len; @@ -64,7 +64,7 @@ public: TNoOutput() = default; protected: - void DoWrite(const void*, size_t) override { + void DoWrite(const void*, size_t) override { } }; @@ -76,7 +76,7 @@ public: } protected: - size_t DoRead(void* buf, size_t len) override { + size_t DoRead(void* buf, size_t len) override { Y_ASSERT(len != 0); if (String_.empty()) { diff --git a/util/stream/ios_ut.cpp b/util/stream/ios_ut.cpp index 139f4296e5..cfb4ccb860 100644 --- a/util/stream/ios_ut.cpp +++ b/util/stream/ios_ut.cpp @@ -177,14 +177,14 @@ public: { } - ~TMyStringOutput() override = default; + ~TMyStringOutput() override = default; - void DoWrite(const void* data, size_t len) override { + void DoWrite(const void* data, size_t len) override { S_.Write(data, len); UNIT_ASSERT(len < BufLen_ || ((len % BufLen_) == 0)); } - void DoWriteV(const TPart* p, size_t count) override { + void DoWriteV(const TPart* p, size_t count) override { TString s; for (size_t i = 0; i < count; ++i) { diff --git a/util/stream/length.h b/util/stream/length.h index 4d508ae24d..2e2d71db93 100644 --- a/util/stream/length.h +++ b/util/stream/length.h @@ -20,15 +20,15 @@ public: { } - ~TLengthLimitedInput() override = default; + ~TLengthLimitedInput() override = default; inline ui64 Left() const noexcept { return Length_; } private: - size_t DoRead(void* buf, size_t len) override; - size_t DoSkip(size_t len) override; + size_t DoRead(void* buf, size_t len) override; + size_t DoSkip(size_t len) override; private: IInputStream* Slave_; @@ -46,7 +46,7 @@ public: { } - ~TCountingInput() override = default; + ~TCountingInput() override = default; /** * \returns The total number of characters read from @@ -57,8 +57,8 @@ public: } private: - size_t DoRead(void* buf, size_t len) override; - size_t DoSkip(size_t len) override; + size_t DoRead(void* buf, size_t len) override; + size_t DoSkip(size_t len) override; size_t DoReadTo(TString& st, char ch) override; ui64 DoReadAll(IOutputStream& out) override; @@ -78,7 +78,7 @@ public: { } - ~TCountingOutput() override = default; + ~TCountingOutput() override = default; TCountingOutput(TCountingOutput&&) noexcept = default; TCountingOutput& operator=(TCountingOutput&&) noexcept = default; @@ -92,7 +92,7 @@ public: } private: - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; private: IOutputStream* Slave_; diff --git a/util/stream/mem.cpp b/util/stream/mem.cpp index 22a3339e27..964a475788 100644 --- a/util/stream/mem.cpp +++ b/util/stream/mem.cpp @@ -20,7 +20,7 @@ TMemoryInput::TMemoryInput(const TStringBuf buf) noexcept { } -TMemoryInput::~TMemoryInput() = default; +TMemoryInput::~TMemoryInput() = default; size_t TMemoryInput::DoNext(const void** ptr, size_t len) { len = Min(Len_, len); @@ -36,7 +36,7 @@ void TMemoryInput::DoUndo(size_t len) { Buf_ -= len; } -TMemoryOutput::~TMemoryOutput() = default; +TMemoryOutput::~TMemoryOutput() = default; size_t TMemoryOutput::DoNext(void** ptr) { Y_ENSURE(Buf_ < End_, TStringBuf("memory output stream exhausted")); diff --git a/util/stream/mem.h b/util/stream/mem.h index 18a5d46772..aa93f26561 100644 --- a/util/stream/mem.h +++ b/util/stream/mem.h @@ -97,7 +97,7 @@ public: } private: - size_t DoNext(const void** ptr, size_t len) override; + size_t DoNext(const void** ptr, size_t len) override; void DoUndo(size_t len) override; private: @@ -176,7 +176,7 @@ public: private: size_t DoNext(void** ptr) override; void DoUndo(size_t len) override; - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; void DoWriteC(char c) override; protected: diff --git a/util/stream/multi.cpp b/util/stream/multi.cpp index b2354298a0..2f9b247cb2 100644 --- a/util/stream/multi.cpp +++ b/util/stream/multi.cpp @@ -7,7 +7,7 @@ TMultiInput::TMultiInput(IInputStream* f, IInputStream* s) noexcept { } -TMultiInput::~TMultiInput() = default; +TMultiInput::~TMultiInput() = default; size_t TMultiInput::DoRead(void* buf, size_t len) { const size_t ret = C_->Read(buf, len); diff --git a/util/stream/multi.h b/util/stream/multi.h index 8bfd462d99..03e7a1e5c7 100644 --- a/util/stream/multi.h +++ b/util/stream/multi.h @@ -16,8 +16,8 @@ public: ~TMultiInput() override; private: - size_t DoRead(void* buf, size_t len) override; - size_t DoSkip(size_t len) override; + size_t DoRead(void* buf, size_t len) override; + size_t DoSkip(size_t len) override; size_t DoReadTo(TString& st, char ch) override; private: diff --git a/util/stream/null.cpp b/util/stream/null.cpp index 4e8b298145..59a62d9a29 100644 --- a/util/stream/null.cpp +++ b/util/stream/null.cpp @@ -9,7 +9,7 @@ TNullIO& NPrivate::StdNullStream() noexcept { TNullInput::TNullInput() noexcept { } -TNullInput::~TNullInput() = default; +TNullInput::~TNullInput() = default; size_t TNullInput::DoRead(void*, size_t) { return 0; @@ -25,7 +25,7 @@ size_t TNullInput::DoNext(const void**, size_t) { TNullOutput::TNullOutput() noexcept = default; -TNullOutput::~TNullOutput() = default; +TNullOutput::~TNullOutput() = default; void TNullOutput::DoWrite(const void* /*buf*/, size_t /*len*/) { } @@ -33,4 +33,4 @@ void TNullOutput::DoWrite(const void* /*buf*/, size_t /*len*/) { TNullIO::TNullIO() noexcept { } -TNullIO::~TNullIO() = default; +TNullIO::~TNullIO() = default; diff --git a/util/stream/null.h b/util/stream/null.h index 8c335a9a78..41f831c9ca 100644 --- a/util/stream/null.h +++ b/util/stream/null.h @@ -17,9 +17,9 @@ public: ~TNullInput() override; private: - size_t DoRead(void* buf, size_t len) override; - size_t DoSkip(size_t len) override; - size_t DoNext(const void** ptr, size_t len) override; + size_t DoRead(void* buf, size_t len) override; + size_t DoSkip(size_t len) override; + size_t DoNext(const void** ptr, size_t len) override; }; /** @@ -34,7 +34,7 @@ public: TNullOutput& operator=(TNullOutput&&) noexcept = default; private: - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; }; /** diff --git a/util/stream/output.cpp b/util/stream/output.cpp index db81b81b70..77ac3e62e9 100644 --- a/util/stream/output.cpp +++ b/util/stream/output.cpp @@ -346,10 +346,10 @@ namespace { { } - ~TStdOutput() override = default; + ~TStdOutput() override = default; private: - void DoWrite(const void* buf, size_t len) override { + void DoWrite(const void* buf, size_t len) override { if (len != fwrite(buf, 1, len, F_)) { #if defined(_win_) // On Windows, if 'F_' is console -- 'fwrite' returns count of written characters. @@ -363,7 +363,7 @@ namespace { } } - void DoFlush() override { + void DoFlush() override { if (fflush(F_) != 0) { ythrow TSystemError() << "fflush failed"; } @@ -380,7 +380,7 @@ namespace { { } - ~TStdErr() override = default; + ~TStdErr() override = default; }; struct TStdOut: public TStdOutput { @@ -389,7 +389,7 @@ namespace { { } - ~TStdOut() override = default; + ~TStdOut() override = default; }; TStdOut Out; diff --git a/util/stream/output.h b/util/stream/output.h index 00eef50b95..847e96ae2b 100644 --- a/util/stream/output.h +++ b/util/stream/output.h @@ -42,7 +42,7 @@ public: { } - inline ~TPart() = default; + inline ~TPart() = default; static inline TPart CrLf() noexcept { return TPart("\r\n", 2); diff --git a/util/stream/pipe.cpp b/util/stream/pipe.cpp index 51be1934a7..1a137d868c 100644 --- a/util/stream/pipe.cpp +++ b/util/stream/pipe.cpp @@ -36,7 +36,7 @@ TPipeBase::TPipeBase(const TString& command, const char* mode) { } -TPipeBase::~TPipeBase() = default; +TPipeBase::~TPipeBase() = default; TPipeInput::TPipeInput(const TString& command) : TPipeBase(command, "r") @@ -98,7 +98,7 @@ TPipedInput::TPipedInput(PIPEHANDLE fd) { } -TPipedInput::~TPipedInput() = default; +TPipedInput::~TPipedInput() = default; size_t TPipedInput::DoRead(void* buf, size_t len) { if (!Handle_.IsOpen()) { @@ -112,7 +112,7 @@ TPipedOutput::TPipedOutput(PIPEHANDLE fd) { } -TPipedOutput::~TPipedOutput() = default; +TPipedOutput::~TPipedOutput() = default; void TPipedOutput::DoWrite(const void* buf, size_t len) { if (!Handle_.IsOpen() || static_cast<ssize_t>(len) != Handle_.Write(buf, len)) { diff --git a/util/stream/pipe.h b/util/stream/pipe.h index 18525b9517..544155462b 100644 --- a/util/stream/pipe.h +++ b/util/stream/pipe.h @@ -48,7 +48,7 @@ public: TPipeInput(const TString& command); private: - size_t DoRead(void* buf, size_t len) override; + size_t DoRead(void* buf, size_t len) override; }; /** @@ -73,7 +73,7 @@ public: void Close(); private: - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; }; class TPipedBase { @@ -94,7 +94,7 @@ public: ~TPipedInput() override; private: - size_t DoRead(void* buf, size_t len) override; + size_t DoRead(void* buf, size_t len) override; }; /** @@ -106,7 +106,7 @@ public: ~TPipedOutput() override; private: - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; }; /** @} */ diff --git a/util/stream/str.cpp b/util/stream/str.cpp index 13f0e8ef28..09ef0b911e 100644 --- a/util/stream/str.cpp +++ b/util/stream/str.cpp @@ -2,7 +2,7 @@ static constexpr size_t MIN_BUFFER_GROW_SIZE = 16; -TStringInput::~TStringInput() = default; +TStringInput::~TStringInput() = default; size_t TStringInput::DoNext(const void** ptr, size_t len) { len = Min(len, S_->size() - Pos_); @@ -16,7 +16,7 @@ void TStringInput::DoUndo(size_t len) { Pos_ -= len; } -TStringOutput::~TStringOutput() = default; +TStringOutput::~TStringOutput() = default; size_t TStringOutput::DoNext(void** ptr) { if (S_->size() == S_->capacity()) { @@ -41,4 +41,4 @@ void TStringOutput::DoWriteC(char c) { S_->push_back(c); } -TStringStream::~TStringStream() = default; +TStringStream::~TStringStream() = default; diff --git a/util/stream/str.h b/util/stream/str.h index 028bd572c0..f75bbce887 100644 --- a/util/stream/str.h +++ b/util/stream/str.h @@ -48,7 +48,7 @@ public: } protected: - size_t DoNext(const void** ptr, size_t len) override; + size_t DoNext(const void** ptr, size_t len) override; void DoUndo(size_t len) override; private: @@ -97,7 +97,7 @@ public: protected: size_t DoNext(void** ptr) override; void DoUndo(size_t len) override; - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; void DoWriteC(char c) override; private: diff --git a/util/stream/tee.cpp b/util/stream/tee.cpp index 99873b95ba..1057ea06e3 100644 --- a/util/stream/tee.cpp +++ b/util/stream/tee.cpp @@ -6,7 +6,7 @@ TTeeOutput::TTeeOutput(IOutputStream* l, IOutputStream* r) noexcept { } -TTeeOutput::~TTeeOutput() = default; +TTeeOutput::~TTeeOutput() = default; void TTeeOutput::DoWrite(const void* buf, size_t len) { L_->Write(buf, len); diff --git a/util/stream/tee.h b/util/stream/tee.h index c69e232fb9..de47e57d17 100644 --- a/util/stream/tee.h +++ b/util/stream/tee.h @@ -16,9 +16,9 @@ public: ~TTeeOutput() override; private: - void DoWrite(const void* buf, size_t len) override; - void DoFlush() override; - void DoFinish() override; + void DoWrite(const void* buf, size_t len) override; + void DoFlush() override; + void DoFinish() override; private: IOutputStream* L_; diff --git a/util/stream/tempbuf.h b/util/stream/tempbuf.h index a6dc001025..f14d8ebf01 100644 --- a/util/stream/tempbuf.h +++ b/util/stream/tempbuf.h @@ -17,5 +17,5 @@ public: TTempBufOutput& operator=(TTempBufOutput&&) noexcept = default; protected: - void DoWrite(const void* data, size_t len) override; + void DoWrite(const void* data, size_t len) override; }; diff --git a/util/stream/tokenizer.h b/util/stream/tokenizer.h index b2398efdd1..4693b0174d 100644 --- a/util/stream/tokenizer.h +++ b/util/stream/tokenizer.h @@ -39,7 +39,7 @@ public: { } - inline ~TIterator() = default; + inline ~TIterator() = default; inline void operator++() { Next(); diff --git a/util/stream/walk.h b/util/stream/walk.h index 7e62cb44dc..ee0fe6925b 100644 --- a/util/stream/walk.h +++ b/util/stream/walk.h @@ -17,7 +17,7 @@ public: protected: void DoUndo(size_t len) override; - size_t DoNext(const void** ptr, size_t len) override; + size_t DoNext(const void** ptr, size_t len) override; /** * Returns the next data chunk from this input stream. There are no diff --git a/util/stream/walk_ut.cpp b/util/stream/walk_ut.cpp index e0a783799f..a458c68bbf 100644 --- a/util/stream/walk_ut.cpp +++ b/util/stream/walk_ut.cpp @@ -11,7 +11,7 @@ public: } protected: - size_t DoUnboundedNext(const void** ptr) override { + size_t DoUnboundedNext(const void** ptr) override { if (Index_ >= Data_.size()) { return 0; } diff --git a/util/stream/zerocopy.h b/util/stream/zerocopy.h index 3315aa3a51..9130c8dd5e 100644 --- a/util/stream/zerocopy.h +++ b/util/stream/zerocopy.h @@ -50,8 +50,8 @@ public: } protected: - size_t DoRead(void* buf, size_t len) override; - size_t DoSkip(size_t len) override; + size_t DoRead(void* buf, size_t len) override; + size_t DoSkip(size_t len) override; ui64 DoReadAll(IOutputStream& out) override; virtual size_t DoNext(const void** ptr, size_t len) = 0; }; diff --git a/util/stream/zlib.cpp b/util/stream/zlib.cpp index 60f4e9439f..2fc4188de9 100644 --- a/util/stream/zlib.cpp +++ b/util/stream/zlib.cpp @@ -26,7 +26,7 @@ namespace { memset(Z(), 0, sizeof(*Z())); } - inline ~TZLibCommon() = default; + inline ~TZLibCommon() = default; inline const char* GetErrMsg() const noexcept { return Z()->msg != nullptr ? Z()->msg : "unknown error"; @@ -170,10 +170,10 @@ namespace { { } - ~TDecompressStream() override = default; + ~TDecompressStream() override = default; private: - size_t DoNext(const void** ptr, size_t len) override { + size_t DoNext(const void** ptr, size_t len) override { void* buf = AdditionalData(); *ptr = buf; @@ -332,7 +332,7 @@ void TZLibDecompress::SetAllowMultipleStreams(bool allowMultipleStreams) { Impl_->SetAllowMultipleStreams(allowMultipleStreams); } -TZLibDecompress::~TZLibDecompress() = default; +TZLibDecompress::~TZLibDecompress() = default; size_t TZLibDecompress::DoRead(void* buf, size_t size) { return Impl_->Read(buf, MaxPortion(size)); @@ -377,4 +377,4 @@ void TZLibCompress::DoFinish() { } } -TBufferedZLibDecompress::~TBufferedZLibDecompress() = default; +TBufferedZLibDecompress::~TBufferedZLibDecompress() = default; diff --git a/util/stream/zlib.h b/util/stream/zlib.h index e7de7c81b7..3487858dac 100644 --- a/util/stream/zlib.h +++ b/util/stream/zlib.h @@ -65,7 +65,7 @@ public: ~TZLibDecompress() override; protected: - size_t DoRead(void* buf, size_t size) override; + size_t DoRead(void* buf, size_t size) override; public: class TImpl; @@ -138,9 +138,9 @@ public: private: void Init(const TParams& opts); - void DoWrite(const void* buf, size_t size) override; - void DoFlush() override; - void DoFinish() override; + void DoWrite(const void* buf, size_t size) override; + void DoFlush() override; + void DoFinish() override; public: class TImpl; diff --git a/util/system/atomic_ut.cpp b/util/system/atomic_ut.cpp index 07211ffba7..ec0e16bfaa 100644 --- a/util/system/atomic_ut.cpp +++ b/util/system/atomic_ut.cpp @@ -175,7 +175,7 @@ private: inline void TestAtomicPtr() { int* p; - AtomicSet(p, nullptr); + AtomicSet(p, nullptr); UNIT_ASSERT_VALUES_EQUAL(AtomicGet(p), 0); @@ -183,8 +183,8 @@ private: AtomicSet(p, &i); UNIT_ASSERT_VALUES_EQUAL(AtomicGet(p), &i); - UNIT_ASSERT_VALUES_EQUAL(AtomicSwap(&p, nullptr), &i); - UNIT_ASSERT(AtomicCas(&p, &i, nullptr)); + UNIT_ASSERT_VALUES_EQUAL(AtomicSwap(&p, nullptr), &i); + UNIT_ASSERT(AtomicCas(&p, &i, nullptr)); } }; diff --git a/util/system/condvar.cpp b/util/system/condvar.cpp index 62f3d22356..b31e0dca64 100644 --- a/util/system/condvar.cpp +++ b/util/system/condvar.cpp @@ -132,7 +132,7 @@ TCondVar::TCondVar() { } -TCondVar::~TCondVar() = default; +TCondVar::~TCondVar() = default; void TCondVar::BroadCast() noexcept { Impl_->BroadCast(); diff --git a/util/system/condvar_ut.cpp b/util/system/condvar_ut.cpp index 5130a18d32..d883c3fc49 100644 --- a/util/system/condvar_ut.cpp +++ b/util/system/condvar_ut.cpp @@ -50,7 +50,7 @@ class TCondVarTest: public TTestBase { { } - void Process(void*) override { + void Process(void*) override { THolder<TThreadTask> This(this); (this->*Func_)(); diff --git a/util/system/context.h b/util/system/context.h index d2a349bfc5..a60e087f01 100644 --- a/util/system/context.h +++ b/util/system/context.h @@ -45,7 +45,7 @@ #endif struct ITrampoLine { - virtual ~ITrampoLine() = default; + virtual ~ITrampoLine() = default; virtual void DoRun(); virtual void DoRunNaked(); @@ -131,7 +131,7 @@ public: TContMachineContext(const TContClosure& c); - inline ~TContMachineContext() = default; + inline ~TContMachineContext() = default; void SwitchTo(TContMachineContext* next) noexcept; @@ -176,6 +176,6 @@ struct TExceptionSafeContext: public TContMachineContext { void SwitchTo(TExceptionSafeContext* to) noexcept; #if defined(_unix_) - void* Buf_[2] = {nullptr, nullptr}; + void* Buf_[2] = {nullptr, nullptr}; #endif }; diff --git a/util/system/dynlib.cpp b/util/system/dynlib.cpp index 9d2541c25f..deeb1d5654 100644 --- a/util/system/dynlib.cpp +++ b/util/system/dynlib.cpp @@ -103,7 +103,7 @@ TDynamicLibrary::TDynamicLibrary(const TString& path, int flags) { Open(path.data(), flags); } -TDynamicLibrary::~TDynamicLibrary() = default; +TDynamicLibrary::~TDynamicLibrary() = default; void TDynamicLibrary::Open(const char* path, int flags) { Impl_.Reset(TImpl::SafeCreate(path, flags)); diff --git a/util/system/dynlib.h b/util/system/dynlib.h index 66eaf4a5c1..c590209c28 100644 --- a/util/system/dynlib.h +++ b/util/system/dynlib.h @@ -49,12 +49,12 @@ private: public: TExternalSymbol() noexcept { - PLib = nullptr; - DLib = nullptr; + PLib = nullptr; + DLib = nullptr; } TExternalSymbol(const TExternalSymbol& es) { - PLib = nullptr; - DLib = nullptr; + PLib = nullptr; + DLib = nullptr; if (es.IsDynamic()) Open(es.LibName().data(), es.VtblName().data()); else if (es.IsStatic()) @@ -75,7 +75,7 @@ public: } // set the symbol from dynamic source void Open(const char* lib_name, const char* vtbl_name) { - if (DLib != nullptr || PLib != nullptr) + if (DLib != nullptr || PLib != nullptr) return; try { DLib = new TDynamicLibrary(); @@ -83,7 +83,7 @@ public: PLib = (TLib*)DLib->Sym(vtbl_name); } catch (...) { delete DLib; - DLib = nullptr; + DLib = nullptr; throw; } lname = lib_name; @@ -91,7 +91,7 @@ public: } // set the symbol from static source void SetSym(TLib* pl) noexcept { - if (DLib == nullptr && PLib == nullptr) + if (DLib == nullptr && PLib == nullptr) PLib = pl; } void Close() noexcept { @@ -111,9 +111,9 @@ public: return vname; } bool IsStatic() const noexcept { - return DLib == nullptr && PLib != nullptr; + return DLib == nullptr && PLib != nullptr; } bool IsDynamic() const noexcept { - return DLib && DLib->IsLoaded() && PLib != nullptr; + return DLib && DLib->IsLoaded() && PLib != nullptr; } }; diff --git a/util/system/event_ut.cpp b/util/system/event_ut.cpp index 2506cb7a91..e2a524034d 100644 --- a/util/system/event_ut.cpp +++ b/util/system/event_ut.cpp @@ -26,7 +26,7 @@ namespace { { } - void Process(void*) override { + void Process(void*) override { THolder<TThreadTask> This(this); if (Id_ == 0) { @@ -58,7 +58,7 @@ namespace { { } - void Process(void*) override { + void Process(void*) override { Ev_.Signal(); } }; @@ -74,7 +74,7 @@ namespace { { } - void Process(void*) override { + void Process(void*) override { Ev->WaitI(); Ev.Destroy(); } diff --git a/util/system/file.cpp b/util/system/file.cpp index 4a261d020c..49960416d2 100644 --- a/util/system/file.cpp +++ b/util/system/file.cpp @@ -858,7 +858,7 @@ public: } } - inline ~TImpl() = default; + inline ~TImpl() = default; inline void Close() { if (!Handle_.Close()) { @@ -1107,7 +1107,7 @@ TFile::TFile(const TString& fName, EOpenMode oMode) { } -TFile::~TFile() = default; +TFile::~TFile() = default; void TFile::Close() { Impl_->Close(); diff --git a/util/system/filemap.cpp b/util/system/filemap.cpp index 7454a4cb94..c630a15ebc 100644 --- a/util/system/filemap.cpp +++ b/util/system/filemap.cpp @@ -381,7 +381,7 @@ TMemoryMap::TMemoryMap(const TFile& file, EOpenMode om, TString dbgName) { } -TMemoryMap::~TMemoryMap() = default; +TMemoryMap::~TMemoryMap() = default; TMemoryMap::TMapResult TMemoryMap::Map(i64 offset, size_t size) { return Impl_->Map(offset, size); diff --git a/util/system/mutex.h b/util/system/mutex.h index 032630d134..3568a8215b 100644 --- a/util/system/mutex.h +++ b/util/system/mutex.h @@ -30,7 +30,7 @@ public: Release(); } - ~TFakeMutex() = default; + ~TFakeMutex() = default; }; class TMutex { diff --git a/util/system/mutex_ut.cpp b/util/system/mutex_ut.cpp index c8d7caafa1..759081ae9e 100644 --- a/util/system/mutex_ut.cpp +++ b/util/system/mutex_ut.cpp @@ -38,7 +38,7 @@ class TMutexTest: public TTestBase { { } - void Process(void*) override { + void Process(void*) override { THolder<TThreadTask> This(this); (this->*Func_)(); diff --git a/util/system/pipe.cpp b/util/system/pipe.cpp index a543bd7472..c41fe30f24 100644 --- a/util/system/pipe.cpp +++ b/util/system/pipe.cpp @@ -128,7 +128,7 @@ TPipe::TPipe(PIPEHANDLE fd) { } -TPipe::~TPipe() = default; +TPipe::~TPipe() = default; void TPipe::Close() { Impl_->Close(); diff --git a/util/system/rwlock.cpp b/util/system/rwlock.cpp index bb3dcbf188..941f35d3f6 100644 --- a/util/system/rwlock.cpp +++ b/util/system/rwlock.cpp @@ -219,7 +219,7 @@ TRWMutex::TRWMutex() { } -TRWMutex::~TRWMutex() = default; +TRWMutex::~TRWMutex() = default; void TRWMutex::AcquireRead() noexcept { Impl_->AcquireRead(); diff --git a/util/system/rwlock_ut.cpp b/util/system/rwlock_ut.cpp index 2b384c05b3..3fc1210887 100644 --- a/util/system/rwlock_ut.cpp +++ b/util/system/rwlock_ut.cpp @@ -40,7 +40,7 @@ class TRWMutexTest: public TTestBase { { } - void Process(void*) override { + void Process(void*) override { THolder<TThreadTask> This(this); (this->*Func_)(); diff --git a/util/system/sem.cpp b/util/system/sem.cpp index 4a93b903b5..93a1390e05 100644 --- a/util/system/sem.cpp +++ b/util/system/sem.cpp @@ -225,7 +225,7 @@ TSemaphore::TSemaphore(const char* name, ui32 maxFreeCount) { } -TSemaphore::~TSemaphore() = default; +TSemaphore::~TSemaphore() = default; void TSemaphore::Release() noexcept { Impl_->Release(); @@ -263,7 +263,7 @@ TFastSemaphore::TFastSemaphore(ui32 maxFreeCount) { } -TFastSemaphore::~TFastSemaphore() = default; +TFastSemaphore::~TFastSemaphore() = default; void TFastSemaphore::Release() noexcept { Impl_->Release(); diff --git a/util/system/shellcommand.cpp b/util/system/shellcommand.cpp index b1989b5c8c..3b7361381b 100644 --- a/util/system/shellcommand.cpp +++ b/util/system/shellcommand.cpp @@ -1132,7 +1132,7 @@ TShellCommand::TShellCommand(const TStringBuf cmd, const TShellCommandOptions& o { } -TShellCommand::~TShellCommand() = default; +TShellCommand::~TShellCommand() = default; TShellCommand& TShellCommand::operator<<(const TStringBuf argument) { Impl->AppendArgument(argument); diff --git a/util/system/shellcommand_ut.cpp b/util/system/shellcommand_ut.cpp index 9d849279d2..9ccf29deef 100644 --- a/util/system/shellcommand_ut.cpp +++ b/util/system/shellcommand_ut.cpp @@ -263,11 +263,11 @@ Y_UNIT_TEST_SUITE(TShellCommandTest) { Y_UNIT_TEST(TestStreamClose) { struct TStream: public IOutputStream { size_t NumCloses = 0; - void DoWrite(const void* buf, size_t len) override { + void DoWrite(const void* buf, size_t len) override { Y_UNUSED(buf); Y_UNUSED(len); } - void DoFinish() override { + void DoFinish() override { ++NumCloses; } } stream; diff --git a/util/system/shmat.h b/util/system/shmat.h index d9da3c151a..80007beae8 100644 --- a/util/system/shmat.h +++ b/util/system/shmat.h @@ -13,7 +13,7 @@ class TSharedMemory: public TThrRefBase { public: TSharedMemory(); - ~TSharedMemory() override; + ~TSharedMemory() override; bool Create(int Size); bool Open(const TGUID& id, int size); diff --git a/util/system/tls.cpp b/util/system/tls.cpp index c2f1a04a14..82cf6da223 100644 --- a/util/system/tls.cpp +++ b/util/system/tls.cpp @@ -114,7 +114,7 @@ namespace { virtual TPerThreadStorage* MyStorageSlow() = 0; - virtual ~TGenericTlsBase() = default; + virtual ~TGenericTlsBase() = default; }; } @@ -138,7 +138,7 @@ namespace { } private: - TPerThreadStorage* MyStorageSlow() override { + TPerThreadStorage* MyStorageSlow() override { void* ret = pthread_getspecific(Key_); if (!ret) { @@ -245,7 +245,7 @@ TKey::TKey(TDtor dtor) TKey::TKey(TKey&&) noexcept = default; -TKey::~TKey() = default; +TKey::~TKey() = default; void* TKey::Get() const { return Impl_->Get(); diff --git a/util/system/tls.h b/util/system/tls.h index 3c4f56dbeb..3ce7211841 100644 --- a/util/system/tls.h +++ b/util/system/tls.h @@ -180,18 +180,18 @@ namespace NTls { class TValue: public TMoveOnly { class TConstructor { public: - TConstructor() noexcept = default; + TConstructor() noexcept = default; - virtual ~TConstructor() = default; + virtual ~TConstructor() = default; virtual T* Construct(void* ptr) const = 0; }; class TDefaultConstructor: public TConstructor { public: - ~TDefaultConstructor() override = default; + ~TDefaultConstructor() override = default; - T* Construct(void* ptr) const override { + T* Construct(void* ptr) const override { //memset(ptr, 0, sizeof(T)); return ::new (ptr) T(); } @@ -205,9 +205,9 @@ namespace NTls { { } - ~TCopyConstructor() override = default; + ~TCopyConstructor() override = default; - T* Construct(void* ptr) const override { + T* Construct(void* ptr) const override { return ::new (ptr) T(Value); } diff --git a/util/thread/factory.cpp b/util/thread/factory.cpp index 48e898f32d..381c11e4f8 100644 --- a/util/thread/factory.cpp +++ b/util/thread/factory.cpp @@ -16,7 +16,7 @@ namespace { } } - void DoRun(IThreadAble* func) override { + void DoRun(IThreadAble* func) override { Thr_.Reset(new TThread(ThreadProc, func)); Thr_->Start(); @@ -45,7 +45,7 @@ namespace { inline TSystemThreadFactory() noexcept { } - IThread* DoCreate() override { + IThread* DoCreate() override { return new TPoolThread; } }; diff --git a/util/thread/factory.h b/util/thread/factory.h index 561fcbac88..f56f624618 100644 --- a/util/thread/factory.h +++ b/util/thread/factory.h @@ -7,9 +7,9 @@ class IThreadFactory { public: class IThreadAble { public: - inline IThreadAble() noexcept = default; + inline IThreadAble() noexcept = default; - virtual ~IThreadAble() = default; + virtual ~IThreadAble() = default; inline void Execute() { DoExecute(); @@ -23,9 +23,9 @@ public: friend class IThreadFactory; public: - inline IThread() noexcept = default; + inline IThread() noexcept = default; - virtual ~IThread() = default; + virtual ~IThread() = default; inline void Join() noexcept { DoJoin(); diff --git a/util/thread/factory_ut.cpp b/util/thread/factory_ut.cpp index 647d96c901..5e340fe4c8 100644 --- a/util/thread/factory_ut.cpp +++ b/util/thread/factory_ut.cpp @@ -15,9 +15,9 @@ class TThrPoolTest: public TTestBase { { } - ~TRunAble() override = default; + ~TRunAble() override = default; - void DoExecute() override { + void DoExecute() override { done = true; } diff --git a/util/thread/lfstack.h b/util/thread/lfstack.h index ca3d95f3c3..8a3ea70638 100644 --- a/util/thread/lfstack.h +++ b/util/thread/lfstack.h @@ -11,7 +11,7 @@ class TLockFreeStack: TNonCopyable { T Value; TNode* Next; - TNode() = default; + TNode() = default; template <class U> explicit TNode(U&& val) diff --git a/util/thread/pool.cpp b/util/thread/pool.cpp index 05fad02e9b..d2a921f199 100644 --- a/util/thread/pool.cpp +++ b/util/thread/pool.cpp @@ -201,7 +201,7 @@ private: } } - void DoExecute() override { + void DoExecute() override { THolder<TTsr> tsr(new TTsr(Parent_)); if (Namer) { @@ -652,7 +652,7 @@ namespace { { } - void Process(void* data) override { + void Process(void* data) override { THolder<TOwnedObjectInQueue> self(this); Owned->Process(data); } @@ -688,7 +688,7 @@ namespace { { } - ~TThreadImpl() override = default; + ~TThreadImpl() override = default; inline void WaitForStart() noexcept { StartEvent_.Wait(); @@ -699,7 +699,7 @@ namespace { } private: - void Process(void* /*tsr*/) override { + void Process(void* /*tsr*/) override { TThreadImplRef This(this); { @@ -736,7 +736,7 @@ namespace { } private: - void DoRun(IThreadAble* func) override { + void DoRun(IThreadAble* func) override { TThreadImplRef impl(new TThreadImpl(func)); Parent_->SafeAdd(impl.Get()); diff --git a/util/thread/pool.h b/util/thread/pool.h index d1ea3a67cb..de3fbd11ab 100644 --- a/util/thread/pool.h +++ b/util/thread/pool.h @@ -13,7 +13,7 @@ class TDuration; struct IObjectInQueue { - virtual ~IObjectInQueue() = default; + virtual ~IObjectInQueue() = default; /** * Supposed to be implemented by user, to define jobs processed @@ -227,7 +227,7 @@ public: } private: - IThread* DoCreate() override; + IThread* DoCreate() override; }; /** @@ -237,14 +237,14 @@ private: */ class TFakeThreadPool: public IThreadPool { public: - bool Add(IObjectInQueue* pObj) override Y_WARN_UNUSED_RESULT { + bool Add(IObjectInQueue* pObj) override Y_WARN_UNUSED_RESULT { TTsr tsr(this); pObj->Process(tsr); return true; } - void Start(size_t, size_t = 0) override { + void Start(size_t, size_t = 0) override { } void Stop() noexcept override { @@ -269,12 +269,12 @@ public: TThreadPool(const TParams& params = {}); ~TThreadPool() override; - bool Add(IObjectInQueue* obj) override Y_WARN_UNUSED_RESULT; + bool Add(IObjectInQueue* obj) override Y_WARN_UNUSED_RESULT; /** * @param queueSizeLimit means "unlimited" when = 0 * @param threadCount means "single thread" when = 0 */ - void Start(size_t threadCount, size_t queueSizeLimit = 0) override; + void Start(size_t threadCount, size_t queueSizeLimit = 0) override; void Stop() noexcept override; size_t Size() const noexcept override; size_t GetThreadCountExpected() const noexcept; @@ -302,7 +302,7 @@ public: */ void SetMaxIdleTime(TDuration interval); - bool Add(IObjectInQueue* obj) override Y_WARN_UNUSED_RESULT; + bool Add(IObjectInQueue* obj) override Y_WARN_UNUSED_RESULT; /** @param thrnum, @param maxque are ignored */ void Start(size_t thrnum = 0, size_t maxque = 0) override; void Stop() noexcept override; @@ -319,12 +319,12 @@ public: TSimpleThreadPool(const TParams& params = {}); ~TSimpleThreadPool() override; - bool Add(IObjectInQueue* obj) override Y_WARN_UNUSED_RESULT; + bool Add(IObjectInQueue* obj) override Y_WARN_UNUSED_RESULT; /** * @parameter thrnum. If thrnum is 0, use TAdaptiveThreadPool with small * SetMaxIdleTime interval parameter. if thrnum is not 0, use non-blocking TThreadPool */ - void Start(size_t thrnum, size_t maxque = 0) override; + void Start(size_t thrnum, size_t maxque = 0) override; void Stop() noexcept override; size_t Size() const noexcept override; @@ -365,11 +365,11 @@ public: } } - void* CreateThreadSpecificResource() override { + void* CreateThreadSpecificResource() override { return Slave_->CreateThreadSpecificResource(); } - void DestroyThreadSpecificResource(void* resource) override { + void DestroyThreadSpecificResource(void* resource) override { Slave_->DestroyThreadSpecificResource(resource); } diff --git a/util/thread/pool_ut.cpp b/util/thread/pool_ut.cpp index 893770d0c4..2dc725da7c 100644 --- a/util/thread/pool_ut.cpp +++ b/util/thread/pool_ut.cpp @@ -23,7 +23,7 @@ struct TThreadPoolTest { { } - void Process(void*) override { + void Process(void*) override { THolder<TTask> This(this); TGuard<TSpinLock> guard(Test->Lock); @@ -41,7 +41,7 @@ struct TThreadPoolTest { { } - ~TOwnedTask() override { + ~TOwnedTask() override { Destructed = true; } @@ -75,11 +75,11 @@ struct TThreadPoolTest { class TFailAddQueue: public IThreadPool { public: - bool Add(IObjectInQueue* /*obj*/) override Y_WARN_UNUSED_RESULT { + bool Add(IObjectInQueue* /*obj*/) override Y_WARN_UNUSED_RESULT { return false; } - void Start(size_t, size_t) override { + void Start(size_t, size_t) override { } void Stop() noexcept override { diff --git a/util/ysafeptr.h b/util/ysafeptr.h index af7dfd4bed..430563af67 100644 --- a/util/ysafeptr.h +++ b/util/ysafeptr.h @@ -283,7 +283,7 @@ protected: public: TPtrBase() - : ptr(nullptr) + : ptr(nullptr) { } TPtrBase(TUserObj* _ptr) @@ -306,7 +306,7 @@ public: TUserObj* Extract() { TUserObj* pRes = ptr; DecRef(ptr); - ptr = nullptr; + ptr = nullptr; return pRes; } @@ -341,7 +341,7 @@ public: //////////////////////////////////////////////////////////////////////////////////////////////////// template <class T> inline bool IsValid(T* p) { - return p != nullptr && !CastToObjectBase(p)->IsRefInvalid(); + return p != nullptr && !CastToObjectBase(p)->IsRefInvalid(); } template <class T, class TRef> inline bool IsValid(const TPtrBase<T, TRef>& p) { |