From fa3db33a5441ed31f9d8c19dc6984d160b86e4da Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 6 Nov 2003 12:29:23 +0000
Subject: updated pidl to auto-generate the ndr_push_*() functions for the
 Samba4 rpc framework

not complete, but sufficient for a number of lsa functions
(This used to be commit 42cd6904f51bac1ff92f0aea0deffb11864dfac2)
---
 source4/build/pidl/idl.gram | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'source4/build/pidl/idl.gram')

diff --git a/source4/build/pidl/idl.gram b/source4/build/pidl/idl.gram
index 00b3952ba2..b700cb378e 100644
--- a/source4/build/pidl/idl.gram
+++ b/source4/build/pidl/idl.gram
@@ -33,14 +33,14 @@ typedef : 'typedef' <commit> type identifier array_len(?) ';'
                      "TYPE" => "TYPEDEF", 
 		     "NAME" => $item{identifier},
 		     "DATA" => $item{type},
-		     "ARRAY_LEN" => $item{array_len}[0]
+		     "ARRAY_LEN" => $item[5][0]
         }}
         | <error?>
 
 struct: 'struct' <commit> '{' element_list1(?) '}' 
         {{
                      "TYPE" => "STRUCT", 
-		     "ELEMENTS" => util::FlattenArray($item{element_list1})
+		     "ELEMENTS" => util::FlattenArray2($item[4])
         }}
       | <error?>
 
@@ -48,7 +48,7 @@ union: property_list(s?) 'union' <commit> '{' union_element(s?) '}'
 	 {{
 		"TYPE" => "UNION",
 		"PROPERTIES" => util::FlattenArray($item[1]),
-		"DATA" => $item{union_element}
+		"DATA" => $item[5]
 	 }}
 	 | <error?>
 
@@ -70,8 +70,8 @@ base_element: property_list(s?) type pointer(s?) identifier array_len(?)
 			   "NAME" => $item{identifier},
 			   "TYPE" => $item{type},
 			   "PROPERTIES" => util::FlattenArray($item[1]),
-			   "POINTERS" => $#{$item{pointer}}==-1?undef:$#{$item{pointer}}+1,
-			   "ARRAY_LEN" => $item{array_len}[0]
+			   "POINTERS" => $#{$item[3]}==-1?undef:$#{$item[3]}+1,
+			   "ARRAY_LEN" => $item[5][0]
               }}
             | <error>
 
@@ -97,6 +97,7 @@ property: 'unique'
 	  | 'in'
 	  | 'out'
 	  | 'ref'
+	  | 'struct_len'
 	  | 'context_handle'
 	  | 'string'
 	  | 'byte_count_pointer' '(' expression ')' {{ "$item[1]" => "$item{expression}" }}
-- 
cgit