From 08571a5f093a06c9ceb0b9179901e1b9e0828b2d Mon Sep 17 00:00:00 2001 From: Kotov <44296606+AIexandrKotov@users.noreply.github.com> Date: Mon, 19 Aug 2019 04:13:39 +0500 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20=D0=BD?= =?UTF-8?q?=D0=B5=20=D0=BF=D0=B0=D0=B4=D0=B0=D0=B5=D1=82=20=D0=BE=D1=82=20?= =?UTF-8?q?/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/Lng/Eng/PABCNETC.dat | 1 + bin/Lng/Rus/PABCNETC.dat | 1 + bin/Lng/Ukr/PABCNETC.dat | 1 + pabcnetc/ConsoleCompiler.cs | 9 +++++++-- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/bin/Lng/Eng/PABCNETC.dat b/bin/Lng/Eng/PABCNETC.dat index 3953b33e4..42ccc3ea8 100644 --- a/bin/Lng/Eng/PABCNETC.dat +++ b/bin/Lng/Eng/PABCNETC.dat @@ -2,6 +2,7 @@ %PREFIX%=PABCNETC_ ERROR_INVALID_DIRECTORY=Error: Invalid direcory +ERROR_DIRECTORY_NOT_FOUND=Error: Directory not found FULL_ERROR_LIST=Full error list: OK_{0}MS_{1}LINES=OK {0}ms ({1}lines) TOTAL{0}_FILES{1}_LINES_{2}_TIME{3}=Total: {0} files ({1}kb,{2}lines). Time: {3}ms diff --git a/bin/Lng/Rus/PABCNETC.dat b/bin/Lng/Rus/PABCNETC.dat index 450529a24..65dcb9a52 100644 --- a/bin/Lng/Rus/PABCNETC.dat +++ b/bin/Lng/Rus/PABCNETC.dat @@ -2,6 +2,7 @@ %PREFIX%=PABCNETC_ ERROR_INVALID_DIRECTORY=Ошибка: неправильная директория +ERROR_DIRECTORY_NOT_FOUND=Ошибка: директория не найдена FULL_ERROR_LIST=Полный список ошибок: OK_{0}MS_{1}LINES=OK {0}ms ({1}строк) TOTAL{0}_FILES{1}_LINES_{2}_TIME{3}=Всего: {0} файлов ({1}kb,{2}строк). Время: {3}ms diff --git a/bin/Lng/Ukr/PABCNETC.dat b/bin/Lng/Ukr/PABCNETC.dat index ac8da78af..b1abc9294 100644 --- a/bin/Lng/Ukr/PABCNETC.dat +++ b/bin/Lng/Ukr/PABCNETC.dat @@ -2,6 +2,7 @@ %PREFIX%=PABCNETC_ ERROR_INVALID_DIRECTORY=Помилка: неправильний каталог +ERROR_DIRECTORY_NOT_FOUND=Помилка: каталог не знайден FULL_ERROR_LIST=Повний список помилок: OK_{0}MS_{1}LINES=OK {0}ms ({1}рядків) TOTAL{0}_FILES{1}_LINES_{2}_TIME{3}=Усього: {0} файлів ({1}kb,{2}рядків). Час: {3}ms diff --git a/pabcnetc/ConsoleCompiler.cs b/pabcnetc/ConsoleCompiler.cs index b40321815..28dad0bb5 100644 --- a/pabcnetc/ConsoleCompiler.cs +++ b/pabcnetc/ConsoleCompiler.cs @@ -192,7 +192,12 @@ namespace PascalABCCompiler { files = di.GetFiles(mask); } - catch(DirectoryNotFoundException) + catch (DirectoryNotFoundException) + { + WriteErrorText(StringResourcesGet("ERROR_DIRECTORY_NOT_FOUND") + Environment.NewLine); + return; + } + catch (ArgumentException) { WriteErrorText(StringResourcesGet("ERROR_INVALID_DIRECTORY") + Environment.NewLine); return; @@ -207,7 +212,7 @@ namespace PascalABCCompiler AllLinesCompiled += Compiler.LinesCompiled; length += fi.Length; } - if(!short_output) + if (!short_output) if (GlobalErrorsList.Count > 0 && files.Length > 1) { WriteErrorText(StringResourcesGet("FULL_ERROR_LIST") + Environment.NewLine);