From cc5f9350b1ff8551f2cae140a76cd321979802b1 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 2 Aug 2005 16:21:30 +0000
Subject: r8920: Make NAME hash entry for struct elements a list.

Return array length entries for elements that have an array specifier.
(This used to be commit 17689ca7403dd8762185611da2e08545af611d71)
---
 source4/build/pidl/smb_interfaces.yp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'source4/build')

diff --git a/source4/build/pidl/smb_interfaces.yp b/source4/build/pidl/smb_interfaces.yp
index b84ed1c1c1..bfb5dc7ed7 100644
--- a/source4/build/pidl/smb_interfaces.yp
+++ b/source4/build/pidl/smb_interfaces.yp
@@ -70,7 +70,7 @@ element:
 	| union
 	| STRUCT IDENTIFIER pointers IDENTIFIER ';'
 		{{
-			"NAME" => $_[2],
+			"NAME" => [$_[2]],
 			"POINTERS" => $_[3],
 			"TYPE" => "struct $_[2]",
 		}}
@@ -82,20 +82,21 @@ element:
 		}}
 	| CONST type pointers IDENTIFIER array ';'
 		{{
-			   "NAME" => $_[4],
+			   "NAME" => [$_[4]],
 			   "TYPE" => $_[2],
 			   "POINTERS" => $_[3],
 		}}
 	| type pointers IDENTIFIER array ';'
 		{{
-			   "NAME" => $_[3],
+			   "NAME" => [$_[3]],
 			   "TYPE" => $_[1],
 			   "POINTERS" => $_[2],
+			   "ARRAY_LENGTH" => $_[4]
 		}}
 ;
 
 array: #empty
-	| '[' CONSTANT  ']'
+	| '[' CONSTANT  ']'	{ int($_[2]) }
 ;
 
 type: IDENTIFIER
-- 
cgit