Permalink
Browse files

bug fix #324

  • Loading branch information...
1 parent eccf368 commit 5de8f1602324dc835013977e28844780a7365e15 @ibond84 ibond84 committed Dec 22, 2016
@@ -1727,7 +1727,7 @@ protected virtual string GetDescriptionForCompiledMethod(ICompiledMethodScope sc
if (!class_generic_table.ContainsKey(class_generic_args[i].Name))
class_generic_table.Add(class_generic_args[i].Name, j);
if (scope.GenericArgs != null && scope.GenericArgs.Count > j)
- generic_param_args.Add(class_generic_args[i].Name, scope.GenericArgs[j]);
+ generic_param_args.Add(class_generic_args[i].Name, GetSimpleDescription(scope.DeclaringType.GenericInstances[0]));
else if (scope.DeclaringType.TemplateArguments != null && scope.DeclaringType.TemplateArguments.Length > j)
generic_param_args.Add(class_generic_args[i].Name, scope.DeclaringType.TemplateArguments[j]);
}
@@ -1754,9 +1754,9 @@ protected virtual string GetDescriptionForCompiledMethod(ICompiledMethodScope sc
int ind = class_generic_table[tt[i].Name];
if (scope.GenericArgs != null && scope.GenericArgs.Count > ind)
{
- sb.Append(scope.GenericArgs[ind]);
+ sb.Append(GetSimpleDescription(scope.DeclaringType.GenericInstances[ind]));
if (!generic_param_args.ContainsKey(tt[i].Name))
- generic_param_args.Add(tt[i].Name, scope.GenericArgs[ind]);
+ generic_param_args.Add(tt[i].Name, GetSimpleDescription(scope.DeclaringType.GenericInstances[ind]));
}
}
else
@@ -1868,7 +1868,7 @@ protected virtual string GetDescriptionForProcedure(IProcScope scope)
{
if (extensionType != null)
{
- sb.Append(extensionType);
+ sb.Append(extensionType+".");
sb.Append(scope.Name);
}
else
@@ -0,0 +1,9 @@
+begin
+ var seq1 := Range(1, 3)+2;
+ var arr := seq1.ToArray;
+ assert(arr[3] = 2);
+ seq1 := 2+Range(1, 3);
+ assert(seq1.First = 2);
+ seq1 := Range(1, 3)+Range(4, 6);
+ assert(seq1.Last = 6);
+end.
@@ -1101,9 +1101,11 @@ public expression_node find_operator(string name, expression_node left, expressi
#endif
function_node fn = ((function_node)(sic.sym_info));
- if (convertion_data_and_alghoritms.is_exist_eq_method_in_list(fn, funcs) != null)
+ if (convertion_data_and_alghoritms.is_exist_eq_method_in_list(fn, funcs) == null)
{
- break;
+ //break;
+ funcs.AddElement(fn);
+
}
funcs.AddElement(fn);
sic_last = sic;

0 comments on commit 5de8f16

Please sign in to comment.