diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-05 00:14:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:18 -0500 |
| commit | 0ba751b0aa0112139c419d72ae620df1d5c177b7 (patch) | |
| tree | 877f4b7ba0fb6be3fb60a503f667da581a67c726 /source4/build/pidl/idl.yp | |
| parent | b90c0850fc01574b89e1cd0da0af43879e7ba6d7 (diff) | |
| download | samba-0ba751b0aa0112139c419d72ae620df1d5c177b7.tar.gz samba-0ba751b0aa0112139c419d72ae620df1d5c177b7.tar.bz2 samba-0ba751b0aa0112139c419d72ae620df1d5c177b7.zip | |
r4522: PROPERTIES are now handled at the typedef level
(This used to be commit 73d5a033e8e9de536239c53e8a063e9be0eff701)
Diffstat (limited to 'source4/build/pidl/idl.yp')
| -rw-r--r-- | source4/build/pidl/idl.yp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/source4/build/pidl/idl.yp b/source4/build/pidl/idl.yp index 664192f4b4..be152c5475 100644 --- a/source4/build/pidl/idl.yp +++ b/source4/build/pidl/idl.yp @@ -23,9 +23,9 @@ idl: coclass: property_list 'coclass' identifier '{' interfaces '}' optional_semicolon {$_[3] => { "TYPE" => "COCLASS", - "PROPERTIES" => $_[1], - "NAME" => $_[3], - "DATA" => $_[5], + "PROPERTIES" => $_[1], + "NAME" => $_[3], + "DATA" => $_[5], }} ; @@ -37,10 +37,10 @@ interfaces: interface: property_list 'interface' identifier base_interface '{' definitions '}' optional_semicolon {$_[3] => { "TYPE" => "INTERFACE", - "PROPERTIES" => $_[1], - "NAME" => $_[3], - "BASE" => $_[4], - "DATA" => $_[6], + "PROPERTIES" => $_[1], + "NAME" => $_[3], + "BASE" => $_[4], + "DATA" => $_[6], }} ; @@ -117,19 +117,17 @@ enum_element: identifier | identifier '=' anytext { "$_[1]$_[2]$_[3]" } ; -struct: property_list 'struct' '{' element_list1 '}' +struct: 'struct' '{' element_list1 '}' {{ "TYPE" => "STRUCT", - "PROPERTIES" => $_[1], - "ELEMENTS" => $_[4] + "ELEMENTS" => $_[3] }} ; -union: property_list 'union' '{' union_elements '}' +union: 'union' '{' union_elements '}' {{ "TYPE" => "UNION", - "PROPERTIES" => $_[1], - "DATA" => $_[4] + "DATA" => $_[3] }} ; |