administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

bug fix #1896

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2019-07-08 12:38:58 +03:00
parent 55f177af1c
commit 663b363ec0
8 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -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;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%MINOR%=5
%REVISION%=2181
%COREVERSION%=0
%REVISION%=2184
%MINOR%=5
%MAJOR%=3

BIN
Localization/DefaultLang.resources
View file

Binary file not shown.

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.5.0.2181'
!define VERSION '3.5.0.2184'

10
TreeConverter/SymbolTable/DSST/SymbolTable.cs
View file

@ -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;
}*/
}
}
}

9
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -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;
}

2
bin/Lng/Eng/VisualPascalABCNET.dat
View file

@ -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

2
bin/Lng/Rus/VisualPascalABCNET.dat
View file

@ -37,7 +37,7 @@ M_DELETE=Удалить
MR_SERVICE=Сервис
M_OPTIONS=Настройки...
M_AUTOINSERT_CODE=Режим автовставки кода
M_AUTOINSERT_CODE=Режим автозавершения кода
MR_VIEW=Вид
M_BOTTOMPANEL=Нижняя панель