diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-25 17:12:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:44 -0500 |
| commit | 94793b80d7fbd6121bb30e36b25e63abe078feee (patch) | |
| tree | edec0fe69da42c0001276b02a58e5fd53985b574 /source4/pidl/lib/Parse/Pidl/Samba4 | |
| parent | 25d57c0ad8704894ee055f74bab2f33b688a7d72 (diff) | |
| download | samba-94793b80d7fbd6121bb30e36b25e63abe078feee.tar.gz samba-94793b80d7fbd6121bb30e36b25e63abe078feee.tar.bz2 samba-94793b80d7fbd6121bb30e36b25e63abe078feee.zip | |
r12484: Initial work on supporting non-typedeffed types
(This used to be commit e7ac6c708dde7afb4c92a8cc4dea7a95b7054e3e)
Diffstat (limited to 'source4/pidl/lib/Parse/Pidl/Samba4')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm | 4 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/EJSHeader.pm | 4 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm index f5aea73d12..8c576c44f9 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm @@ -706,7 +706,7 @@ sub EjsInterface($$) %constants = (); - foreach my $d (@{$interface->{TYPEDEFS}}) { + foreach my $d (@{$interface->{TYPES}}) { ($needed->{"push_$d->{NAME}"}) && EjsTypedefPush($d); ($needed->{"pull_$d->{NAME}"}) && EjsTypedefPull($d); } @@ -831,7 +831,7 @@ sub NeededInterface($$) foreach my $d (@{$interface->{FUNCTIONS}}) { NeededFunction($d, $needed); } - foreach my $d (reverse @{$interface->{TYPEDEFS}}) { + foreach my $d (reverse @{$interface->{TYPES}}) { NeededTypedef($d, $needed); } } diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/EJSHeader.pm b/source4/pidl/lib/Parse/Pidl/Samba4/EJSHeader.pm index a204ee7a56..eae7ddce5f 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/EJSHeader.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/EJSHeader.pm @@ -54,9 +54,7 @@ sub HeaderInterface($) pidl "\n"; - foreach my $d (@{$interface->{TYPEDEFS}}) { - HeaderTypedefProto($d); - } + HeaderTypedefProto($_) foreach (@{$interface->{TYPES}}); pidl "\n"; pidl "#endif /* _HEADER_EJS_$interface->{NAME} */\n"; diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 2242323747..bb9d32487a 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -2313,7 +2313,7 @@ sub ParseInterface($$) HeaderInterface($interface); # Typedefs - foreach my $d (@{$interface->{TYPEDEFS}}) { + foreach my $d (@{$interface->{TYPES}}) { ($needed->{"push_$d->{NAME}"}) && ParseTypedefPush($d); ($needed->{"pull_$d->{NAME}"}) && ParseTypedefPull($d); ($needed->{"print_$d->{NAME}"}) && ParseTypedefPrint($d); @@ -2456,7 +2456,7 @@ sub NeededInterface($$) { my ($interface,$needed) = @_; NeededFunction($_, $needed) foreach (@{$interface->{FUNCTIONS}}); - NeededTypedef($_, $needed) foreach (reverse @{$interface->{TYPEDEFS}}); + NeededTypedef($_, $needed) foreach (reverse @{$interface->{TYPES}}); } 1; |