Merged revisions 3634 via svnmerge from

http://[email protected]/svn/fpc/trunk

........
r3634 | peter | 2006-05-23 09:23:45 +0200 (Tue, 23 May 2006) | 2 lines

  * allow passing single element to open array bug6960

........

git-svn-id: branches/fixes_2_0@3637 -

.gitattributes

@@ -6490,6 +6490,7 @@ tests/webtbs/tw5036.pp svneol=native#text/plain
 tests/webtbs/tw5082.pp -text svneol=unset#text/plain
 tests/webtbs/tw6435.pp svneol=native#text/plain
 tests/webtbs/tw6735.pp svneol=native#text/plain
+tests/webtbs/tw6960.pp svneol=native#text/plain
 tests/webtbs/ub1873.pp svneol=native#text/plain
 tests/webtbs/ub1883.pp svneol=native#text/plain
 tests/webtbs/uw0555.pp svneol=native#text/plain

compiler/htypechk.pas

@@ -1333,10 +1333,15 @@ implementation
             end;
           arraydef :
             begin
-              if is_open_array(def_to) and
-                 is_dynamic_array(def_from) and
-                equal_defs(tarraydef(def_from).elementtype.def,tarraydef(def_to).elementtype.def) then
-                eq:=te_convert_l2;
+              if is_open_array(def_to) then
+                begin
+                  if is_dynamic_array(def_from) and
+                     equal_defs(tarraydef(def_from).elementtype.def,tarraydef(def_to).elementtype.def) then
+                    eq:=te_convert_l2
+                  else
+                    if equal_defs(def_from,tarraydef(def_to).elementtype.def) then
+                      eq:=te_convert_l2;
+                end;
             end;
           pointerdef :
             begin

tests/webtbs/tw6960.pp

@@ -0,0 +1,14 @@
+function SomeFunc(var Res: array of Double): Integer;
+begin
+  // do something
+  writeln(High(Res));
+end;
+
+var
+  d: Double;
+  darr: array[1..3] of Double;
+begin
+  SomeFunc(d); // Delphi accepts this, FPC does not
+  SomeFunc(darr); // OK
+end.
+