diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-11-06 22:54:49 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:24:58 -0500 |
| commit | 863dcbfa06cfcd4eecba7559c03080321b9a8a91 (patch) | |
| tree | 8805de459397bf5d336979b6ed75abc4a2d7fa43 /source4/pidl/idl.yp | |
| parent | 4e61cee33c87d479e1bf0f11ecf9e84299bc7544 (diff) | |
| download | samba-863dcbfa06cfcd4eecba7559c03080321b9a8a91.tar.gz samba-863dcbfa06cfcd4eecba7559c03080321b9a8a91.tar.bz2 samba-863dcbfa06cfcd4eecba7559c03080321b9a8a91.zip | |
r19588: Use include and import statements rather than depends() and helper().
(This used to be commit 347ae9628202ca4de4318ef8156999239aad9192)
Diffstat (limited to 'source4/pidl/idl.yp')
| -rw-r--r-- | source4/pidl/idl.yp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/source4/pidl/idl.yp b/source4/pidl/idl.yp index 932730d7bf..cfbc0f200f 100644 --- a/source4/pidl/idl.yp +++ b/source4/pidl/idl.yp @@ -23,28 +23,33 @@ idl: | idl importlib { push(@{$_[1]}, $_[2]); $_[1] } ; -import: 'import' commalisttext ';' {{ +import: 'import' commalist ';' {{ "TYPE" => "IMPORT", - "PATHS" => [ $_[2] ], + "PATHS" => $_[2], "FILE" => $_[0]->YYData->{INPUT_FILENAME}, "LINE" => $_[0]->YYData->{LINE} }} ; -include: 'import' commalisttext ';' {{ +include: 'include' commalist ';' {{ "TYPE" => "INCLUDE", - "PATHS" => [ $_[2] ], + "PATHS" => $_[2], "FILE" => $_[0]->YYData->{INPUT_FILENAME}, "LINE" => $_[0]->YYData->{LINE} }} ; -importlib: 'importlib' commalisttext ';' {{ +importlib: 'importlib' commalist ';' {{ "TYPE" => "IMPORTLIB", - "PATHS" => [ $_[2] ], + "PATHS" => $_[2], "FILE" => $_[0]->YYData->{INPUT_FILENAME}, "LINE" => $_[0]->YYData->{LINE} }} ; +commalist: + text { [ $_[1] ] } + | commalist ',' text { push(@{$_[1]}, $_[3]); $_[1] } +; + coclass: property_list 'coclass' identifier '{' interface_names '}' optional_semicolon {{ "TYPE" => "COCLASS", |