From 663b363ec032b72950ee581bf35521bbd854ebc3 Mon Sep 17 00:00:00 2001
From: Mikhalkovich Stanislav <miks@math.sfedu.ru>
Date: Mon, 8 Jul 2019 12:38:58 +0300
Subject: [PATCH] bug fix #1896

---
 Configuration/GlobalAssemblyInfo.cs           |   2 +-
 Configuration/Version.defs                    |   4 ++--
 Localization/DefaultLang.resources            | Bin 91210 -> 91213 bytes
 ReleaseGenerators/PascalABCNET_version.nsh    |   2 +-
 TreeConverter/SymbolTable/DSST/SymbolTable.cs |  10 +++++-----
 .../TreeConversion/syntax_tree_visitor.cs     |   9 ++++++++-
 bin/Lng/Eng/VisualPascalABCNET.dat            |   2 +-
 bin/Lng/Rus/VisualPascalABCNET.dat            |   2 +-
 8 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs
index ab9a78567..d5ff416ba 100644
--- a/Configuration/GlobalAssemblyInfo.cs
+++ b/Configuration/GlobalAssemblyInfo.cs
@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "5";
 	public const string Build = "0";
-	public const string Revision = "2181";
+	public const string Revision = "2184";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
diff --git a/Configuration/Version.defs b/Configuration/Version.defs
index 145b11a60..f7cbbf3d8 100644
--- a/Configuration/Version.defs
+++ b/Configuration/Version.defs
@@ -1,4 +1,4 @@
-%MINOR%=5
-%REVISION%=2181
 %COREVERSION%=0
+%REVISION%=2184
+%MINOR%=5
 %MAJOR%=3
diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources
index 4a1d4d66938db51b3c017f3b156fc5822c7a7dc3..8a14dfa1b8ae34e1aed64d196662a7baab09f1f6 100644
GIT binary patch
delta 34
scmV+-0Nww}$OX;F1(4tYX@TLj;Q=%k3g_VB<?#6B?dbov92fyEOix@A?*IS*

delta 31
pcmV+)0O0@4$OX#C1(4tYW`W_g;Q=%k2jcPa;Nt4&w;vb*E=&xI5EcLc

diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh
index 3511f86c1..4a9c971d5 100644
--- a/ReleaseGenerators/PascalABCNET_version.nsh
+++ b/ReleaseGenerators/PascalABCNET_version.nsh
@@ -1 +1 @@
-!define VERSION '3.5.0.2181'
+!define VERSION '3.5.0.2184'
diff --git a/TreeConverter/SymbolTable/DSST/SymbolTable.cs b/TreeConverter/SymbolTable/DSST/SymbolTable.cs
index a938c4ba4..a012023f8 100644
--- a/TreeConverter/SymbolTable/DSST/SymbolTable.cs
+++ b/TreeConverter/SymbolTable/DSST/SymbolTable.cs
@@ -839,13 +839,13 @@ namespace SymbolTable
                     }
                     cl = (ClassScope)cl.BaseClassScope;
                 }
-                /*if (cl.BaseClassScope == null && cl.class_type.base_type is PascalABCCompiler.TreeRealization.compiled_type_node ctn)
+                if (cl.BaseClassScope == null && cl.class_type.base_type is PascalABCCompiler.TreeRealization.compiled_type_node ctn)
                 {
-                    Result = ctn.find(name);
+                    var a = ctn.find(name);
+                    if (a != null)
+                        AddToSymbolInfo(a, Result);
                     return;
-                }*/
-
-
+                }
             }
         }
 
diff --git a/TreeConverter/TreeConversion/syntax_tree_visitor.cs b/TreeConverter/TreeConversion/syntax_tree_visitor.cs
index c90fc5a62..6491ef98f 100644
--- a/TreeConverter/TreeConversion/syntax_tree_visitor.cs
+++ b/TreeConverter/TreeConversion/syntax_tree_visitor.cs
@@ -2406,7 +2406,14 @@ namespace PascalABCCompiler.TreeConverter
         	location loc = get_location(_raise_stmt);
         	if (_raise_stmt.expr == null)
         	{
-                if (current_catch_excep == null) AddError(loc, "RAISE_WITHOUT_PARAMETERS_MUST_BE_IN_CATCH_BLOCK");
+                var st = _raise_stmt.Parent;
+                while (st != null && !(st is exception_block))
+                {
+                    st = st.Parent;
+                }
+                //if (current_catch_excep == null)
+                if (st == null)
+                    AddError(loc, "RAISE_WITHOUT_PARAMETERS_MUST_BE_IN_CATCH_BLOCK");
         		return_value(new rethrow_statement_node(loc));
         		return;
         	}
diff --git a/bin/Lng/Eng/VisualPascalABCNET.dat b/bin/Lng/Eng/VisualPascalABCNET.dat
index 7f67ecfba..711f203b2 100644
--- a/bin/Lng/Eng/VisualPascalABCNET.dat
+++ b/bin/Lng/Eng/VisualPascalABCNET.dat
@@ -37,7 +37,7 @@ M_DELETE=Delete
                 
 MR_SERVICE=Tools
 M_OPTIONS=Options...
-M_AUTOINSERT_CODE=Ñode autoinsert mode
+M_AUTOINSERT_CODE=Ñode autocomplete mode
 
 MR_VIEW=View
 M_BOTTOMPANEL=Bottom Panel
diff --git a/bin/Lng/Rus/VisualPascalABCNET.dat b/bin/Lng/Rus/VisualPascalABCNET.dat
index 508901b5a..c81b77fa2 100644
--- a/bin/Lng/Rus/VisualPascalABCNET.dat
+++ b/bin/Lng/Rus/VisualPascalABCNET.dat
@@ -37,7 +37,7 @@ M_DELETE=Удалить
 
 MR_SERVICE=Серви�
 M_OPTIONS=�а�тройки...
-M_AUTOINSERT_CODE=Режим автов�тавки кода
+M_AUTOINSERT_CODE=Режим автозавершени� кода
 
 MR_VIEW=Вид
 M_BOTTOMPANEL=�ижн�� панель