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

bug fix #275

Browse source
This commit is contained in:
Бондарев Иван 2016-09-14 19:47:34 +02:00
parent 5acf06e270
commit 6b52b13695
1 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
ParserTools/ParserTools/DefaultLanguageInformation.cs
View file

@ -415,6 +415,8 @@ namespace PascalABCCompiler.Parsers
return getLambdaRepresentation(ctn, false, new List<string>());
else if (ctn.Name == "IEnumerable`1")
return "sequence of " + GetShortTypeName(ctn.GetGenericArguments()[0], false);
else if (ctn.Name.Contains("Tuple`"))
return get_tuple_string(ctn);
}
if (ctn.Name.Contains("`"))
{
@ -439,6 +441,35 @@ namespace PascalABCCompiler.Parsers
return ctn.FullName;
}
private string get_tuple_string(ITypeScope[] generic_args)
{
StringBuilder sb = new StringBuilder();
sb.Append("(");
for (int i = 0; i < generic_args.Length; i++)
{
sb.Append(GetSimpleDescriptionWithoutNamespace(generic_args[i]));
if (i < generic_args.Length - 1)
sb.Append(",");
}
sb.Append(")");
return sb.ToString();
}
private string get_tuple_string(Type t)
{
StringBuilder sb = new StringBuilder();
sb.Append("(");
Type[] generic_args = t.GetGenericArguments();
for (int i = 0; i<generic_args.Length; i++)
{
sb.Append(GetShortTypeName(generic_args[i], false));
if (i < generic_args.Length - 1)
sb.Append(",");
}
sb.Append(")");
return sb.ToString();
}
private string get_enum_constants(Type t)
{
FieldInfo[] fields = t.GetFields(BindingFlags.Public|BindingFlags.NonPublic|BindingFlags.Instance|BindingFlags.Static);
@ -828,6 +859,8 @@ namespace PascalABCCompiler.Parsers
return getLambdaRepresentation(ctn, false, new List<string>());
else if (ctn.Name == "IEnumerable`1")
return "sequence of " + GetShortTypeName(ctn.GetGenericArguments()[0], false);
else if (ctn.Name.Contains("Tuple`"))
return get_tuple_string(ctn);
}
int len = ctn.GetGenericArguments().Length;
System.Text.StringBuilder sb = new System.Text.StringBuilder();
@ -1133,7 +1166,7 @@ namespace PascalABCCompiler.Parsers
{
return getLambdaRepresentation(scope, false);
}
else if (scope.CompiledType.Name != null && scope.CompiledType.Name == "IEnumerable`1")
else if (scope.CompiledType.Name == "IEnumerable`1")
{
ITypeScope[] instances = scope.GenericInstances;
if (instances != null && instances.Length > 0)
@ -1143,6 +1176,16 @@ namespace PascalABCCompiler.Parsers
else
return "sequence of T";
}
else if (scope.CompiledType.Name != null && scope.CompiledType.Name.Contains("Tuple`"))
{
ITypeScope[] instances = scope.GenericInstances;
if (instances != null && instances.Length > 0)
{
return get_tuple_string(instances);
}
else
return "(T1,...)";
}
else
{
string s = GetShortTypeName(scope.CompiledType);
@ -1520,6 +1563,8 @@ namespace PascalABCCompiler.Parsers
return getLambdaRepresentation(t, true, generic_args, generic_param_args);
else if (t.Name.Contains("Action`") )
return getLambdaRepresentation(t, false, generic_args, generic_param_args);
else if (t.Name.Contains("Tuple`"))
return get_tuple_string(t);
}
string name = GetShortTypeName(t);
StringBuilder sb = new StringBuilder();