Skip to content

Commit 5de8f16

Browse files
committed
1 parent eccf368 commit 5de8f16

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

ParserTools/ParserTools/DefaultLanguageInformation.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1727,7 +1727,7 @@ protected virtual string GetDescriptionForCompiledMethod(ICompiledMethodScope sc
17271727
if (!class_generic_table.ContainsKey(class_generic_args[i].Name))
17281728
class_generic_table.Add(class_generic_args[i].Name, j);
17291729
if (scope.GenericArgs != null && scope.GenericArgs.Count > j)
1730-
generic_param_args.Add(class_generic_args[i].Name, scope.GenericArgs[j]);
1730+
generic_param_args.Add(class_generic_args[i].Name, GetSimpleDescription(scope.DeclaringType.GenericInstances[0]));
17311731
else if (scope.DeclaringType.TemplateArguments != null && scope.DeclaringType.TemplateArguments.Length > j)
17321732
generic_param_args.Add(class_generic_args[i].Name, scope.DeclaringType.TemplateArguments[j]);
17331733
}
@@ -1754,9 +1754,9 @@ protected virtual string GetDescriptionForCompiledMethod(ICompiledMethodScope sc
17541754
int ind = class_generic_table[tt[i].Name];
17551755
if (scope.GenericArgs != null && scope.GenericArgs.Count > ind)
17561756
{
1757-
sb.Append(scope.GenericArgs[ind]);
1757+
sb.Append(GetSimpleDescription(scope.DeclaringType.GenericInstances[ind]));
17581758
if (!generic_param_args.ContainsKey(tt[i].Name))
1759-
generic_param_args.Add(tt[i].Name, scope.GenericArgs[ind]);
1759+
generic_param_args.Add(tt[i].Name, GetSimpleDescription(scope.DeclaringType.GenericInstances[ind]));
17601760
}
17611761
}
17621762
else
@@ -1868,7 +1868,7 @@ protected virtual string GetDescriptionForProcedure(IProcScope scope)
18681868
{
18691869
if (extensionType != null)
18701870
{
1871-
sb.Append(extensionType);
1871+
sb.Append(extensionType+".");
18721872
sb.Append(scope.Name);
18731873
}
18741874
else

TestSuite/extensionoperators1.pas

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
begin
2+
var seq1 := Range(1, 3)+2;
3+
var arr := seq1.ToArray;
4+
assert(arr[3] = 2);
5+
seq1 := 2+Range(1, 3);
6+
assert(seq1.First = 2);
7+
seq1 := Range(1, 3)+Range(4, 6);
8+
assert(seq1.Last = 6);
9+
end.

TreeConverter/TreeConversion/syntax_tree_visitor.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,9 +1101,11 @@ public expression_node find_operator(string name, expression_node left, expressi
11011101
#endif
11021102

11031103
function_node fn = ((function_node)(sic.sym_info));
1104-
if (convertion_data_and_alghoritms.is_exist_eq_method_in_list(fn, funcs) != null)
1104+
if (convertion_data_and_alghoritms.is_exist_eq_method_in_list(fn, funcs) == null)
11051105
{
1106-
break;
1106+
//break;
1107+
funcs.AddElement(fn);
1108+
11071109
}
11081110
funcs.AddElement(fn);
11091111
sic_last = sic;

0 commit comments

Comments
 (0)