From 700f6876927833ee2d080a689cf46469c8befbb8 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sun, 22 Aug 2010 20:13:27 +0000
Subject: [PATCH] * nested open array constructors are not allowed, resolves
 #17213

git-svn-id: trunk@15876 -
---
 .gitattributes          |  1 +
 compiler/pexpr.pas      |  5 +++++
 tests/webtbs/tw17213.pp | 16 ++++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 tests/webtbs/tw17213.pp

diff --git a/.gitattributes b/.gitattributes
index 52067701a2..0a4bd41532 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10629,6 +10629,7 @@ tests/webtbs/tw17164.pp svneol=native#text/plain
 tests/webtbs/tw17180.pp svneol=native#text/plain
 tests/webtbs/tw17181.pp svneol=native#text/plain
 tests/webtbs/tw1720.pp svneol=native#text/plain
+tests/webtbs/tw17213.pp svneol=native#text/pascal
 tests/webtbs/tw1735.pp svneol=native#text/plain
 tests/webtbs/tw1737.pp svneol=native#text/plain
 tests/webtbs/tw1744.pp svneol=native#text/plain
diff --git a/compiler/pexpr.pas b/compiler/pexpr.pas
index 32dab85877..136e0eac8d 100644
--- a/compiler/pexpr.pas
+++ b/compiler/pexpr.pas
@@ -1712,6 +1712,7 @@ implementation
            p1,p2 : tnode;
            lastp,
            buildp : tarrayconstructornode;
+           old_allow_array_constructor : boolean;
          begin
            buildp:=nil;
          { be sure that a least one arrayconstructn is used, also for an
@@ -1720,6 +1721,9 @@ implementation
              buildp:=carrayconstructornode.create(nil,buildp)
            else
             repeat
+              { nested array constructors are not allowed, see also tests/webtbs/tw17213.pp }
+              old_allow_array_constructor:=allow_array_constructor;
+              allow_array_constructor:=false;
               p1:=comp_expr(true);
               if try_to_consume(_POINTPOINT) then
                 begin
@@ -1737,6 +1741,7 @@ implementation
                  lastp.right:=carrayconstructornode.create(p1,nil);
                  lastp:=tarrayconstructornode(lastp.right);
                end;
+             allow_array_constructor:=old_allow_array_constructor;
            { there could be more elements }
            until not try_to_consume(_COMMA);
            factor_read_set:=buildp;
diff --git a/tests/webtbs/tw17213.pp b/tests/webtbs/tw17213.pp
new file mode 100644
index 0000000000..d9c28b402c
--- /dev/null
+++ b/tests/webtbs/tw17213.pp
@@ -0,0 +1,16 @@
+program openarrayparam;
+{$ifdef FPC}{$mode objfpc}{$h+}{$endif}
+{$ifdef mswindows}{$apptype console}{$endif}
+uses
+ sysutils;
+type
+ testflagty = (tf_1,tf2);
+ testflagsty = set of testflagty;
+
+procedure testproc(const testpar: array of testflagsty);
+begin
+end;
+
+begin
+ testproc([[],[],[]]);
+end.