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

bug fix #1106

Browse source
This commit is contained in:
Бондарев Иван 2019-10-10 19:56:09 +02:00
parent 50326c0726
commit 7395183d7f
4 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
TestSuite/errors/err0332.pas → TestSuite/errors/err0332_set_invalid_type.pas
View file

4
TestSuite/errors/err0342_wrong_dynarr_size.pas Normal file
View file

@ -0,0 +1,4 @@
begin
var b: array [,] of byte := ((1, 2), (3, 4, 5), (5, 6));
b.Println;
end.

4
TestSuite/errors/err0343_wrong_dynarr_rank.pas Normal file
View file

@ -0,0 +1,4 @@
begin
var b: array [,] of byte := ((1, 2), 6, (5, 6));
b.Println;
end.

16
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -14807,16 +14807,20 @@ namespace PascalABCCompiler.TreeConverter
{
array_internal_interface aii = tn.get_internal_interface(internal_interface_kind.unsized_array_interface) as array_internal_interface;
int rank = aii.rank;
int size = -1;
for (int i=0; i<constant.element_values.Count; i++)
{
expression_node e = constant.element_values[i];
if (e is array_initializer)
{
if (cur_rank>=rank)
constant.element_values[i] = ConvertArrayInitializer(tn.element_type,e as array_initializer);
if (size != -1 && size != (e as array_initializer).element_values.Count)
AddError(e.location, "ARRAY_CONST_{0}_ELEMENTS_EXPECTED", size);
size = (e as array_initializer).element_values.Count;
if (cur_rank >= rank)
constant.element_values[i] = ConvertArrayInitializer(tn.element_type, e as array_initializer);
//AddError(new CanNotConvertTypes(e,e.type,tn.element_type,e.location));
else
constant.element_values[i] = ConvertNDimArrayInitializer(tn,cur_rank+1,element_type,e as array_initializer);
constant.element_values[i] = ConvertNDimArrayInitializer(tn,cur_rank + 1, element_type, e as array_initializer);
}
else if (e is record_initializer)
{
@ -14890,16 +14894,20 @@ namespace PascalABCCompiler.TreeConverter
{
array_internal_interface aii = tn.get_internal_interface(internal_interface_kind.unsized_array_interface) as array_internal_interface;
int rank = aii.rank;
int size = -1;
for (int i=0; i<constant.element_values.Count; i++)
{
expression_node e = constant.element_values[i];
if (e is array_const)
{
if (size != -1 && size != (e as array_const).element_values.Count)
AddError(e.location, "ARRAY_CONST_{0}_ELEMENTS_EXPECTED", size);
size = (e as array_const).element_values.Count;
if (cur_rank>=rank)
constant.element_values[i] = ConvertArrayConst(tn.element_type,e as array_const);
//AddError(new CanNotConvertTypes(e,e.type,tn.element_type,e.location));
else
constant.element_values[i] = ConvertNDimArrayConst(tn,cur_rank+1,element_type,e as array_const);
constant.element_values[i] = ConvertNDimArrayConst(tn,cur_rank+1,element_type,e as array_const);
}
else if (e is record_constant)
{