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

исправлена ошибка в выборе перегруженных методов расширений

Browse source
This commit is contained in:
Бондарев Иван 2015-08-11 13:47:28 +02:00
parent 5af89551a9
commit 60df2a54b6
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ReleaseGenerators/PascalABCNET_ALL.bat
View file

@ -1,6 +1,5 @@
"..\utils\NSIS\Unicode\makensis.exe" PascalABCNETMini.nsi
"..\utils\NSIS\Unicode\makensis.exe" PascalABCNETStandart.nsi
"..\utils\NSIS\Unicode\makensis.exe" PascalABCNETWithDotNet.nsi
"..\utils\NSIS\Unicode\makensis.exe" BFParser.nsi
PascalABCNETConsoleZIP.bat
PascalABCNETMonoZIP.bat

22
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -5265,7 +5265,27 @@ namespace PascalABCCompiler.TreeConverter
//lroman//
#endregion
function_node fn = convertion_data_and_alghoritms.select_function(exprs, si, subloc, syntax_nodes_parameters);
function_node fn = null;
if (!skip_first_parameter || si.Next == null)
fn = convertion_data_and_alghoritms.select_function(exprs, si, subloc, syntax_nodes_parameters);
else
{
try
{
fn = convertion_data_and_alghoritms.select_function(exprs, si, subloc, syntax_nodes_parameters);
}
catch (Exception ex)
{
if (skip_first_parameter)
{
si = tmp_si;
exprs.remove_at(0);
fn = convertion_data_and_alghoritms.select_function(exprs, si, subloc, syntax_nodes_parameters);
}
else
throw ex;
}
}
SemanticTree.IGenericInstance igi = fn as SemanticTree.IGenericInstance;
if (igi != null)
{

BIN
bin/TestRunner.exe Normal file
View file

Binary file not shown.