Author: metze Date: 2007-08-16 13:41:48 +0000 (Thu, 16 Aug 2007) New Revision: 24492
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24492 Log: Parse::Pidl::Samba4::Header::Parse() now takes an $ndr tree not the $pidl tree anymore. metze Modified: branches/SAMBA_4_0/source/pidl/tests/Util.pm branches/SAMBA_4_0/source/pidl/tests/header.pl Changeset: Modified: branches/SAMBA_4_0/source/pidl/tests/Util.pm =================================================================== --- branches/SAMBA_4_0/source/pidl/tests/Util.pm 2007-08-16 13:40:41 UTC (rev 24491) +++ branches/SAMBA_4_0/source/pidl/tests/Util.pm 2007-08-16 13:41:48 UTC (rev 24492) @@ -48,12 +48,14 @@ { my ($name,$idl,$c,$extra) = @_; my $pidl = Parse::Pidl::IDL::parse_string("interface echo { $idl }; ", "<$name>"); - ok(defined($pidl), "($name) parse idl"); - my $header = Parse::Pidl::Samba4::Header::Parse($pidl); - ok(defined($header), "($name) generate generic header"); + my $pndr = Parse::Pidl::NDR::Parse($pidl); ok(defined($pndr), "($name) generate NDR tree"); + + my $header = Parse::Pidl::Samba4::Header::Parse($pndr); + ok(defined($header), "($name) generate generic header"); + my $generator = new Parse::Pidl::Samba4::NDR::Parser(); my ($ndrheader,$ndrparser) = $generator->Parse($pndr, undef, undef); ok(defined($ndrparser), "($name) generate NDR parser"); Modified: branches/SAMBA_4_0/source/pidl/tests/header.pl =================================================================== --- branches/SAMBA_4_0/source/pidl/tests/header.pl 2007-08-16 13:40:41 UTC (rev 24491) +++ branches/SAMBA_4_0/source/pidl/tests/header.pl 2007-08-16 13:41:48 UTC (rev 24492) @@ -11,12 +11,14 @@ use Parse::Pidl::Util qw(MyDumper); use Parse::Pidl::Samba4::Header; use Parse::Pidl::IDL qw(parse_string); +use Parse::Pidl::NDR; sub parse_idl($) { my $text = shift; my $idl = Parse::Pidl::IDL::parse_string($text, "nofile"); - return Parse::Pidl::Samba4::Header::Parse($idl); + my $ndr = Parse::Pidl::NDR::Parse($idl); + return Parse::Pidl::Samba4::Header::Parse($ndr); } like(parse_idl(""), qr/\/\* header auto-generated by pidl \*\/\n/sm, "includes work");