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

fix #1828

Browse source
This commit is contained in:
Бондарев Иван 2019-03-10 14:28:47 +01:00
parent 78a8c6b5af
commit 99ed12170e
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CodeCompletion/DomSyntaxTreeVisitor.cs
View file

@ -3282,6 +3282,7 @@ namespace CodeCompletion
element_type = TypeTable.obj_type; element_type = TypeTable.obj_type;
break; break;
} }
//else element_type = TypeTable.obj_type;
} }
} }

2
CodeCompletion/SymTable.cs
View file

@ -5651,6 +5651,8 @@ namespace CodeCompletion
if (code1 != TypeCode.String && code1 != TypeCode.Object) if (code1 != TypeCode.String && code1 != TypeCode.Object)
if (code1 == TypeCode.Double && code2 != TypeCode.Single) if (code1 == TypeCode.Double && code2 != TypeCode.Single)
return false; return false;
else if (strong && code1 == TypeCode.Char && code2 != TypeCode.Char && code2 != TypeCode.String)
return false;
else else
return true; return true;
} }

4
TestSuite/intellisense_tests/set1.pas
View file

@ -1,8 +1,10 @@
begin begin
var s{@var s: set of integer;@} := [1,2,4]; var s{@var s: set of integer;@} := [1,2,4];
var s1{@var s1: set of string;@} := ['12','24','22']; var s1{@var s1: set of string;@} := ['12','24','22'];
var s2{@var s2: set of char;@} := ['1','2','3']; var s2{@var s2: set of char;@} := ['1','2','3'];
var s3{@var s3: set of real;@} := [1,2,4.4]; var s3{@var s3: set of real;@} := [1,2,4.4];
var s4{@var s4: set of real;@} := [1.2,2,4]; var s4{@var s4: set of real;@} := [1.2,2,4];
var s5{@var s5: set of Object;@} := [1.2,2,'aa']; var s5{@var s5: set of Object;@} := [1.2,2,'aa'];
var s6{@var s6: set of Object;@} := [1, '1'];
var s7{@var s7: set of Object;@} := ['1', 1];
end. end.