diff options
| author | Tim Potter <tpot@samba.org> | 2005-08-02 16:21:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:30:57 -0500 |
| commit | cc5f9350b1ff8551f2cae140a76cd321979802b1 (patch) | |
| tree | bc4778fecd884ef2c391d88d6908fc138ce27c91 /source4 | |
| parent | 172a0c7858dc23932dfa414acb35ec89eeba2e41 (diff) | |
| download | samba-cc5f9350b1ff8551f2cae140a76cd321979802b1.tar.gz samba-cc5f9350b1ff8551f2cae140a76cd321979802b1.tar.bz2 samba-cc5f9350b1ff8551f2cae140a76cd321979802b1.zip | |
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)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/pidl/smb_interfaces.yp | 9 |
1 files changed, 5 insertions, 4 deletions
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 |