This commit is contained in:
Mikhalkovich Stanislav 2019-04-09 21:33:09 +03:00
parent 40d1106cff
commit 7726f8e85a
7 changed files with 23 additions and 9 deletions

View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3";
public const string Minor = "4";
public const string Build = "2";
public const string Revision = "2027";
public const string Revision = "2028";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

View file

@ -1,4 +1,4 @@
%COREVERSION%=2
%REVISION%=2027
%MINOR%=4
%REVISION%=2028
%COREVERSION%=2
%MAJOR%=3

View file

@ -1 +1 @@
!define VERSION '3.4.2.2027'
!define VERSION '3.4.2.2028'

View file

@ -3574,6 +3574,7 @@ begin
gr.Transform := m;
end;
Monitor.Exit(f);
tempbmp.Dispose();
end;
procedure FullRedraw;

View file

@ -0,0 +1,12 @@
begin
var p: procedure := ()->
begin end;
try
except
on e: System.ArgumentException do;
on e: Exception do; // Ошибка: Повторно объявленный идентификатор e
end;
Assert(1=1)
end.

View file

@ -135,13 +135,13 @@ namespace TreeConverter.LambdaExpressions.Closure
public override void visit(exception_handler eh)
{
_visitor.context.add_var_definition(eh.variable.name, _visitor.get_location(eh.variable), _visitor.convert_strong(eh.type_name), PascalABCCompiler.SemanticTree.polymorphic_state.ps_common, true);
SymbolInfo si = _visitor.context.find_first(eh.variable.name);
var csi = new CapturedVariablesTreeNode.CapturedSymbolInfo(eh, si);
//_visitor.context.add_var_definition(eh.variable.name, _visitor.get_location(eh.variable), _visitor.convert_strong(eh.type_name), PascalABCCompiler.SemanticTree.polymorphic_state.ps_common, true);
//SymbolInfo si = _visitor.context.find_first(eh.variable.name);
//var csi = new CapturedVariablesTreeNode.CapturedSymbolInfo(eh, si);
//_currentTreeNode.VariablesDefinedInScope.Add(new CapturedVariablesTreeNode.CapturedSymbolInfo(eh, si));
_pendingCapturedSymbols.Add(csi);
//_pendingCapturedSymbols.Add(csi);
ProcessNode(eh.statements);
_pendingCapturedSymbols.Remove(csi);
//_pendingCapturedSymbols.Remove(csi);
}
public override void visit(ident id)

View file

@ -3574,6 +3574,7 @@ begin
gr.Transform := m;
end;
Monitor.Exit(f);
tempbmp.Dispose();
end;
procedure FullRedraw;