bug fix #1896

pascalabcnet · Jul 8, 2019 · 663b363 · 663b363
1 parent 55f177a
commit 663b363
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 12 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -839,13 +839,13 @@ private void FindAllInClass(string name, Scope ClassArea, bool OnlyInThisClass,
                     }
                     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
@@ -2406,7 +2406,14 @@ public override void visit(SyntaxTree.raise_stmt _raise_stmt)
         	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
@@ -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
@@ -37,7 +37,7 @@ M_DELETE=Удалить
 
 MR_SERVICE=Сервис
 M_OPTIONS=Настройки...
-M_AUTOINSERT_CODE=Режим автовставки кода
+M_AUTOINSERT_CODE=Режим автозавершения кода
 
 MR_VIEW=Вид
 M_BOTTOMPANEL=Нижняя панель