sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Allow base classes to be defined in other files.

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-09-12 14:57:19 +02:00
parent 1ca80d037d
commit f29220fe11
4 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/librpc/idl/dcom.idl
View File

@ -3,8 +3,6 @@
http://www.ietf.org/internet-drafts/draft-brown-dcom-v1-spec-04.txt
*/
import "orpc.idl";
[
uuid("18f70770-8e64-11cf-9af1-0020af6e72f4"),
pointer_default(unique),

2
source4/librpc/idl/wmi.idl
View File

@ -1,6 +1,6 @@
#include "idl_types.h"
import "orpc.idl";
import "dcom.idl";
[
uuid("8BC3F05E-D86B-11d0-A075-00C04FB68820")

81
source4/pidl/lib/Parse/Pidl/ODL.pm
View File

@ -5,27 +5,14 @@
package Parse::Pidl::ODL;
use Parse::Pidl qw(error);
use Parse::Pidl::Util qw(has_property);
use Parse::Pidl::IDL;
use Parse::Pidl::Util qw(has_property unmake_str);
use Parse::Pidl::Typelist qw(hasType getType);
use strict;
use vars qw($VERSION);
$VERSION = '0.01';
#####################################################################
# find an interface in an array of interfaces
sub get_interface($$)
{
my($if,$n) = @_;
foreach(@$if) {
next if ($_->{TYPE} ne "INTERFACE");
return $_ if($_->{NAME} eq $n);
}
return undef;
}
sub FunctionAddObjArgs($)
{
my $e = shift;
@ -60,34 +47,58 @@ sub ReplaceInterfacePointers($)
}
# Add ORPC specific bits to an interface.
sub ODL2IDL($)
sub ODL2IDL
{
my $odl = shift;
my ($odl, $basedir, $opt_incdirs) = (@_);
my $addedorpc = 0;
my $interfaces = {};
foreach my $x (@$odl) {
next if ($x->{TYPE} ne "INTERFACE");
# Add [in] ORPCTHIS *this, [out] ORPCTHAT *that
# and replace interfacepointers with MInterfacePointer
# for 'object' interfaces
if (has_property($x, "object")) {
foreach my $e (@{$x->{DATA}}) {
($e->{TYPE} eq "FUNCTION") && FunctionAddObjArgs($e);
ReplaceInterfacePointers($e);
if ($x->{TYPE} eq "IMPORT") {
foreach my $idl_file (@{$x->{PATHS}}) {
$idl_file = unmake_str($idl_file);
my $podl = Parse::Pidl::IDL::parse_file("$basedir/$idl_file", $opt_incdirs);
if (defined(@$podl)) {
require Parse::Pidl::Typelist;
Parse::Pidl::Typelist::LoadIdl($podl);
my $pidl = ODL2IDL($podl);
foreach my $y (@$pidl) {
if ($y->{TYPE} eq "INTERFACE") {
$interfaces->{$y->{NAME}} = $y;
}
}
} else {
error($x, "Failed to parse $idl_file");
}
}
$addedorpc = 1;
}
if ($x->{BASE}) {
my $base = get_interface($odl, $x->{BASE});
if ($x->{TYPE} eq "INTERFACE") {
$interfaces->{$x->{NAME}} = $x;
# Add [in] ORPCTHIS *this, [out] ORPCTHAT *that
# and replace interfacepointers with MInterfacePointer
# for 'object' interfaces
if (has_property($x, "object")) {
foreach my $e (@{$x->{DATA}}) {
($e->{TYPE} eq "FUNCTION") && FunctionAddObjArgs($e);
ReplaceInterfacePointers($e);
}
$addedorpc = 1;
}
unless (defined($base)) {
error($x, "Undefined base interface `$x->{BASE}'");
} else {
foreach my $fn (reverse @{$base->{DATA}}) {
next unless ($fn->{TYPE} eq "FUNCTION");
unshift (@{$x->{DATA}}, $fn);
push (@{$x->{INHERITED_FUNCTIONS}}, $fn->{NAME});
if ($x->{BASE}) {
my $base = $interfaces->{$x->{BASE}};
unless (defined($base)) {
error($x, "Undefined base interface `$x->{BASE}'");
} else {
foreach my $fn (reverse @{$base->{DATA}}) {
next unless ($fn->{TYPE} eq "FUNCTION");
unshift (@{$x->{DATA}}, $fn);
push (@{$x->{INHERITED_FUNCTIONS}}, $fn->{NAME});
}
}
}
}

2
source4/pidl/pidl
View File

@ -656,7 +656,7 @@ sub process_file($)
Parse::Pidl::Compat::Check($pidl);
}
$pidl = Parse::Pidl::ODL::ODL2IDL($pidl);
$pidl = Parse::Pidl::ODL::ODL2IDL($pidl, dirname($idl_file), \@opt_incdirs);
if (defined($opt_ws_parser) or
defined($opt_client) or