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

bug fix #648

Browse source
This commit is contained in:
Бондарев Иван 2018-01-29 21:17:51 +01:00
parent 9ee420d9e6
commit 28a64634ae
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
TestSuite/extensionmethods26.pas Normal file
View file

@ -0,0 +1,13 @@
begin
var a:array of char;
a := Arr('A','B','C');
var b := a + 'D';//'D' is char
assert(b.First = 'A');
assert(b is IEnumerable<char>);
var c := a + 'DE';//'DE' is string
assert(c is IEnumerable<char>);
assert(c.Last = 'E');
var e := 'D' + a;
assert(e is IEnumerable<char>);
assert(e.Last = 'C');
end.

4
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -1088,6 +1088,8 @@ namespace PascalABCCompiler.TreeConverter
}
}
}
if (name == "+" && right_type == SystemLibrary.SystemLibrary.char_type && left_type != SystemLibrary.SystemLibrary.string_type)
no_search_in_extension_methods = false;
SymbolInfoList sil = left_type.find_in_type(name, left_type.Scope, no_search_in_extension_methods);
int added_symbols = -1;
SymbolInfoList sil2 = null;
@ -1096,6 +1098,8 @@ namespace PascalABCCompiler.TreeConverter
//SymbolInfo si2 = right_type.find(name, context.CurrentScope);
if (sil != null)
sil = sil.copy();
if (name == "+" && right_type != SystemLibrary.SystemLibrary.string_type && left_type == SystemLibrary.SystemLibrary.char_type)
no_search_in_extension_methods = false;
sil2 = right_type.find_in_type(name, right_type.Scope, no_search_in_extension_methods);
if ((sil != null) && (sil2 != null))
{