diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-11-16 11:34:32 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-11-16 11:34:32 +0000 |
| commit | 0c5759a4b2615b9c57ee7de04275ced1fc7d19cb (patch) | |
| tree | 678f17e309671ff9b3361b1bb1d5278e5a12b0d1 /source4/build/pidl/idl.gram | |
| parent | 7ca3720acba09c56944a2ef1bd4425e51e733fa4 (diff) | |
| download | samba-0c5759a4b2615b9c57ee7de04275ced1fc7d19cb.tar.gz samba-0c5759a4b2615b9c57ee7de04275ced1fc7d19cb.tar.bz2 samba-0c5759a4b2615b9c57ee7de04275ced1fc7d19cb.zip | |
added support for "relstr", structure and union properties and public
functions
(This used to be commit fb2f8c6bffdaacdddbb7fb82439af70e17ce9a4b)
Diffstat (limited to 'source4/build/pidl/idl.gram')
| -rw-r--r-- | source4/build/pidl/idl.gram | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/build/pidl/idl.gram b/source4/build/pidl/idl.gram index 8cf35676f9..1e96431e47 100644 --- a/source4/build/pidl/idl.gram +++ b/source4/build/pidl/idl.gram @@ -38,10 +38,11 @@ typedef : 'typedef' <commit> type identifier array_len(?) ';' }} | <error?> -struct: 'struct' <commit> '{' element_list1(?) '}' +struct: property_list(s?) 'struct' <commit> '{' element_list1(?) '}' {{ "TYPE" => "STRUCT", - "ELEMENTS" => util::FlattenArray2($item[4]) + "PROPERTIES" => util::FlattenArray($item[1]), + "ELEMENTS" => util::FlattenArray2($item[5]) }} | <error?> @@ -103,6 +104,7 @@ property: 'unique' | 'struct_len' | 'context_handle' | 'string' + | 'public' | 'subcontext' | 'byte_count_pointer' '(' expression ')' {{ "$item[1]" => "$item{expression}" }} | 'size_is' '(' expression ')' {{ "$item[1]" => "$item{expression}" }} |