diff options
| -rw-r--r-- | source4/build/pidl/idl.pm | 2 | ||||
| -rw-r--r-- | source4/build/pidl/idl.yp | 2 | ||||
| -rw-r--r-- | source4/build/pidl/ndr.pm | 27 | ||||
| -rw-r--r-- | source4/build/pidl/odl.pm | 59 | ||||
| -rwxr-xr-x | source4/build/pidl/pidl.pl | 10 | ||||
| -rwxr-xr-x | source4/script/build_idl.sh | 2 |
6 files changed, 70 insertions, 32 deletions
diff --git a/source4/build/pidl/idl.pm b/source4/build/pidl/idl.pm index 6ae7cb463f..5ba427e70c 100644 --- a/source4/build/pidl/idl.pm +++ b/source4/build/pidl/idl.pm @@ -2383,8 +2383,6 @@ sub parse_idl($$) my $idl = $self->YYParse( yylex => \&_Lexer, yyerror => \&_Error ); foreach my $x (@{$idl}) { - NdrParser::InterfaceORPC($x); - # Do the inheritance if (defined($x->{BASE}) and $x->{BASE} ne "") { my $parent = util::get_interface($idl, $x->{BASE}); diff --git a/source4/build/pidl/idl.yp b/source4/build/pidl/idl.yp index aff7f82f69..b12c45c34d 100644 --- a/source4/build/pidl/idl.yp +++ b/source4/build/pidl/idl.yp @@ -374,8 +374,6 @@ sub parse_idl($$) my $idl = $self->YYParse( yylex => \&_Lexer, yyerror => \&_Error ); foreach my $x (@{$idl}) { - NdrParser::InterfaceORPC($x); - # Do the inheritance if (defined($x->{BASE}) and $x->{BASE} ne "") { my $parent = util::get_interface($idl, $x->{BASE}); diff --git a/source4/build/pidl/ndr.pm b/source4/build/pidl/ndr.pm index 0d9b38d07b..019300d784 100644 --- a/source4/build/pidl/ndr.pm +++ b/source4/build/pidl/ndr.pm @@ -2114,33 +2114,6 @@ sub LoadInterface($) } } -# Add ORPC specific bits to an interface. -sub InterfaceORPC($) -{ - my $x = shift; - # Add [in] ORPCTHIS *this, [out] ORPCTHAT *that - # for 'object' interfaces - if (util::has_property($x, "object")) { - foreach my $e (@{$x->{DATA}}) { - if($e->{TYPE} eq "FUNCTION") { - $e->{PROPERTIES}->{object} = 1; - unshift(@{$e->{ELEMENTS}}, - { 'NAME' => 'ORPCthis', - 'POINTERS' => 0, - 'PROPERTIES' => { 'in' => '1' }, - 'TYPE' => 'ORPCTHIS' - }); - unshift(@{$e->{ELEMENTS}}, - { 'NAME' => 'ORPCthat', - 'POINTERS' => 0, - 'PROPERTIES' => { 'out' => '1' }, - 'TYPE' => 'ORPCTHAT' - }); - } - } - } -} - sub Load($) { my $idl = shift; diff --git a/source4/build/pidl/odl.pm b/source4/build/pidl/odl.pm new file mode 100644 index 0000000000..37c8a5a687 --- /dev/null +++ b/source4/build/pidl/odl.pm @@ -0,0 +1,59 @@ +########################################## +# Converts ODL stuctures to IDL structures +# (C) 2004-2005 Jelmer Vernooij <jelmer@samba.org> + +package ODL; + +use strict; + +sub FunctionAddObjArgs($) +{ + my $e = shift; + + unshift(@{$e->{ELEMENTS}}, { + 'NAME' => 'ORPCthis', + 'POINTERS' => 0, + 'PROPERTIES' => { 'in' => '1' }, + 'TYPE' => 'ORPCTHIS' + }); + unshift(@{$e->{ELEMENTS}}, { + 'NAME' => 'ORPCthat', + 'POINTERS' => 0, + 'PROPERTIES' => { 'out' => '1' }, + 'TYPE' => 'ORPCTHAT' + }); +} + +sub ReplaceInterfacePointers($) +{ + my $e = shift; + + foreach my $x (@{$e->{ELEMENTS}}) { + next unless typelist::hasType($x); + next unless typelist::getType($x)->{DATA}->{TYPE} eq "INTERFACE"; + + $x->{TYPE} = "MInterfacePointer"; + } +} + +# Add ORPC specific bits to an interface. +sub ODL2IDL($) +{ + my $odl = shift; + my @idl = @{$odl}; + + foreach my $x (@idl) { + # Add [in] ORPCTHIS *this, [out] ORPCTHAT *that + # for 'object' interfaces + if (util::has_property($x, "object")) { + foreach my $e (@{$x->{DATA}}) { + ($e->{TYPE} eq "FUNCTION") && FunctionAddObjArgs($e); + ReplaceInterfacePointers($e); + } + } + } + + return \@idl; +} + +1; diff --git a/source4/build/pidl/pidl.pl b/source4/build/pidl/pidl.pl index eedbb91d4e..b535215d03 100755 --- a/source4/build/pidl/pidl.pl +++ b/source4/build/pidl/pidl.pl @@ -21,6 +21,7 @@ use client; use proxy; use stub; use ndr; +use odl; use eparser; use validator; use typelist; @@ -40,6 +41,7 @@ my($opt_parser) = 0; my($opt_eparser) = 0; my($opt_keep) = 0; my($opt_swig) = 0; +my($opt_odl) = 0; my($opt_output); my $idl_parser = new idl; @@ -79,6 +81,7 @@ sub ShowHelp() --swig create swig wrapper file --diff run diff on the idl and dumped output --keep keep the .pidl file + --odl accept ODL input \n"; exit(0); } @@ -96,6 +99,7 @@ GetOptions ( 'client' => \$opt_client, 'eparser' => \$opt_eparser, 'diff' => \$opt_diff, + 'odl' => \$opt_odl, 'keep' => \$opt_keep, 'swig' => \$opt_swig ); @@ -109,6 +113,7 @@ sub process_file($) { my $idl_file = shift; my $output; + my $podl; my $pidl; my $basename = basename($idl_file, ".idl"); @@ -143,6 +148,11 @@ sub process_file($) typelist::LoadIdl($pidl); } + if ($opt_odl) { + $podl = $pidl; + $pidl = ODL::ODL2IDL($podl); + } + if ($opt_header) { my($header) = util::ChangeExtension($output, ".h"); util::FileSave($header, IdlHeader::Parse($pidl)); diff --git a/source4/script/build_idl.sh b/source4/script/build_idl.sh index aaa0b12af4..7b49721a5c 100755 --- a/source4/script/build_idl.sh +++ b/source4/script/build_idl.sh @@ -4,7 +4,7 @@ FULLBUILD=$1 [ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1 -PIDL="$PERL ./build/pidl/pidl.pl --output librpc/gen_ndr/ndr_ --parse --header --parser --server --client --swig" +PIDL="$PERL ./build/pidl/pidl.pl --output librpc/gen_ndr/ndr_ --parse --header --parser --server --client --swig --odl" if [ x$FULLBUILD = xFULL ]; then echo Rebuilding all idl files in librpc/idl |