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

fix #1899

Browse source
This commit is contained in:
Ivan Bondarev 2021-01-08 11:32:32 +01:00
parent 4f2da33fb2
commit e8cee58b48
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NETGenerator/CodeGenerator.cs
View file

@ -25,7 +25,7 @@ namespace PascalABCCompiler.CodeGenerators
NETGenerator.CompilerOptions options, Hashtable StandartDirectories, string[] ResourceFiles)
{
il_converter = new NETGenerator.ILConverter(StandartDirectories);
il_converter.ConvertFromTree(ProgramTree,TargetFileName,SourceFileName,options,ResourceFiles);
il_converter.ConvertFromTree(ProgramTree, TargetFileName, SourceFileName, options, ResourceFiles);
}
public void Reset()

11
NETGenerator/NETGenerator.cs
View file

@ -175,9 +175,11 @@ namespace PascalABCCompiler.NETGenerator
private bool has_dereferences = false;
private bool safe_block = false;
private int cur_line = 0;
private bool tried_with_unmanaged_resources = false;
private ISymbolDocumentWriter new_doc;
private List<LocalBuilder> pinned_variables = new List<LocalBuilder>();
private bool pabc_rtl_converted = false;
bool has_unmanaged_resources = false;
private void CheckLocation(SemanticTree.ILocation Location)
{
@ -571,18 +573,20 @@ namespace PascalABCCompiler.NETGenerator
ab = ad.DefineDynamicAssembly(an, AssemblyBuilderAccess.Run, dir);//определяем сборку
else
ab = ad.DefineDynamicAssembly(an, AssemblyBuilderAccess.Save, dir);//определяем сборку
//int nn = ad.GetAssemblies().Length;
if (options.NeedDefineVersionInfo)
{
ab.DefineVersionInfoResource(options.Product, options.ProductVersion, options.Company,
options.Copyright, options.TradeMark);
has_unmanaged_resources = true;
}
if (options.MainResourceFileName != null)
{
try
{
ab.DefineUnmanagedResource(options.MainResourceFileName);
has_unmanaged_resources = true;
}
catch
{
@ -594,6 +598,7 @@ namespace PascalABCCompiler.NETGenerator
try
{
ab.DefineUnmanagedResource(options.MainResourceData);
has_unmanaged_resources = true;
}
catch
{
@ -1091,7 +1096,11 @@ namespace PascalABCCompiler.NETGenerator
catch (System.IO.IOException e)
{
if (tries < num_try_save)
{
if (has_unmanaged_resources)
throw new TreeConverter.SaveAssemblyError(e.Message, new TreeRealization.location(0, 0, 0, 0, new TreeRealization.document(SourceFileName)));
tries++;
}
else
throw new TreeConverter.SaveAssemblyError(e.Message, new TreeRealization.location(0, 0, 0, 0, new TreeRealization.document(SourceFileName)));
}