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

bug fix #144

Browse source
This commit is contained in:
Бондарев Иван 2016-04-25 20:37:57 +02:00
parent eca6267012
commit c785cafe68
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ParserTools/ParserTools/DefaultLanguageInformation.cs
View file

@ -409,9 +409,9 @@ namespace PascalABCCompiler.Parsers
return ctn.FullName;
if (!no_alias)
{
if (ctn.Name.Contains("Func`"))
if (ctn.Name.Contains("Func`") || ctn.Name.Contains("Predicate`"))
return getLambdaRepresentation(ctn, true, new List<string>());
else if (ctn.Name.Contains("Action`") || ctn.Name.Contains("Predicate`"))
else if (ctn.Name.Contains("Action`"))
return getLambdaRepresentation(ctn, false, new List<string>());
else if (ctn.Name == "IEnumerable`1")
return "sequence of " + GetShortTypeName(ctn.GetGenericArguments()[0], false);
@ -822,9 +822,9 @@ namespace PascalABCCompiler.Parsers
{
if (!noalias)
{
if (ctn.Name.Contains("Func`"))
if (ctn.Name.Contains("Func`") || ctn.Name.Contains("Predicate`"))
return getLambdaRepresentation(ctn, true, new List<string>());
else if (ctn.Name.Contains("Action`") || ctn.Name.Contains("Predicate`"))
else if (ctn.Name.Contains("Action`"))
return getLambdaRepresentation(ctn, false, new List<string>());
else if (ctn.Name == "IEnumerable`1")
return "sequence of " + GetShortTypeName(ctn.GetGenericArguments()[0], false);
@ -1081,7 +1081,13 @@ namespace PascalABCCompiler.Parsers
else if (parameters.Count > 1)
sb.Append(parameters[0] + "->" + parameters[1]);
else if (parameters.Count == 1)
sb.Append("()->"+parameters[0]);
{
if (t.Name == "Predicate`1")
sb.Append(parameters[0] + "->boolean");
else
sb.Append("()->" + parameters[0]);
}
}
else if (parameters.Count > 0)
{
@ -1510,9 +1516,9 @@ namespace PascalABCCompiler.Parsers
else
return "sequence of " + (generic_args.Count>0?generic_args[0]:GetShortTypeName(tt, false));
}
else if (t.Name.Contains("Func`"))
else if (t.Name.Contains("Func`") || t.Name.Contains("Predicate`"))
return getLambdaRepresentation(t, true, generic_args, generic_param_args);
else if (t.Name.Contains("Action`") || t.Name.Contains("Predicate`"))
else if (t.Name.Contains("Action`") )
return getLambdaRepresentation(t, false, generic_args, generic_param_args);
}
string name = GetShortTypeName(t);