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

fix #1795

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2019-07-12 00:16:19 +03:00
parent 7059541a44
commit b21c2c0aa3
5 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3"; public const string Major = "3";
public const string Minor = "5"; public const string Minor = "5";
public const string Build = "0"; public const string Build = "0";
public const string Revision = "2193"; public const string Revision = "2194";
public const string MainVersion = Major + "." + Minor; public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%MINOR%=5
%REVISION%=2193
%COREVERSION%=0 %COREVERSION%=0
%REVISION%=2194
%MINOR%=5
%MAJOR%=3 %MAJOR%=3

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.5.0.2193' !define VERSION '3.5.0.2194'

7
TestSuite/errors/err0332.pas Normal file
View file

@ -0,0 +1,7 @@
var r: real;
begin
var s: set of integer;
s := [2,4,r];
Print(s);
end.

4
TreeConverter/TreeConversion/SyntaxTreeVisitorNodes/Assign.cs
View file

@ -36,6 +36,10 @@ namespace PascalABCCompiler.TreeConverter
assign_is_converting = true; assign_is_converting = true;
if (to.type.type_special_kind == type_special_kind.set_type && from.type.type_special_kind == type_special_kind.set_type && // SSM 12/07/19 fix #1795
convertion_data_and_alghoritms.is_value_int_type(to.type.element_type) &&
convertion_data_and_alghoritms.is_value_real_type(from.type.element_type))
AddError(new CanNotConvertTypes(from, from.type, to.type, from.location));
statement_node en = find_operator(_assign.operator_type, to, from, get_location(_assign)); statement_node en = find_operator(_assign.operator_type, to, from, get_location(_assign));
assign_is_converting = false; assign_is_converting = false;
return_value(en); return_value(en);