svn commit: samba r21490 - in branches/SAMBA_4_0: . source/pidl/lib/Parse/Pidl/Samba4 source/pidl/tests

jelmer at samba.org jelmer at samba.org
Wed Feb 21 12:35:24 GMT 2007


Author: jelmer
Date: 2007-02-21 12:35:21 +0000 (Wed, 21 Feb 2007)
New Revision: 21490

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21490

Log:
Add some tests for the EJS code
More work on supporting nested types in EJS.

Added:
   branches/SAMBA_4_0/source/pidl/tests/samba-ejs.pl
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:merge
   - jelmer at samba.org-20060824212938-5923465160f6ab63
jelmer at samba.org-20060830112659-186f132eebc987cc
jelmer at samba.org-20060904121718-63b73248146c14f8
jelmer at samba.org-20060904124721-5e70ab0bd405f748
metze at samba.org-20061010151401-45a5a2ed52cfe172
jelmer at samba.org-20061016130323-400ce51ee51ab30e
jelmer at samba.org-20061016195822-c7783d3ea1a56a53
jelmer at samba.org-20061016230421-75bca2ad62945ede
jelmer at samba.org-20061017145110-8c83a3dd979f6a6a
jelmer at samba.org-20061029173623-eb0459f1d3eb5720
jelmer at samba.org-20070115022006-h5ef1deqflt940b6
jelmer at samba.org-20070116142934-hv99dpwbnq2znh8f
jelmer at samba.org-20070116144126-70rip3bppmvgs3t6
jelmer at samba.org-20070116151516-imvui4r33cj850j9
jelmer at samba.org-20070116154739-3tji4fft7964qgrj
jelmer at samba.org-20070116173900-iasa25stcfty6pbr
jelmer at samba.org-20070117144550-te3o0iy10y14iyo4
jelmer at samba.org-20070122000024-q911packyrjk69ud
jelmer at samba.org-20070122181120-3n8ah238pjbzylyo
jelmer at samba.org-20070122182054-6b26fqrdqyjhyeuc
jelmer at samba.org-20070122233549-k085tfo2o1eqz7mm
jelmer at samba.org-20070123002251-0smz35eva10x84tc
jelmer at samba.org-20070123003546-p0jl6j9tw79q5j1k
jelmer at samba.org-20070123012404-o9w5pmgkm94zsxlu
jelmer at samba.org-20070123094731-ns7dzzzqtb0dlcod
jelmer at samba.org-20070125123431-g3pqm92r31ez9xyc
jelmer at samba.org-20070126125959-3w3t26aps9hmwukv
jelmer at samba.org-20070126132607-64kt7rc2wtqh0c7u
jelmer at samba.org-20070126133903-onfotbg1051ktojo
jelmer at samba.org-20070126144259-171b4t0744jigs5x
jelmer at samba.org-20070126152205-xj7j1avc7683rjy5
jelmer at samba.org-20070128010235-e8st47gcy00ii8kc
jelmer at samba.org-20070128130853-xjjrlrtf830pwnx6
jelmer at samba.org-20070130120806-gfqshokma9j6j3uv
jelmer at samba.org-20070131002510-55yxynmb1o4zvx0x
jelmer at samba.org-20070131115042-oocen3olfgu53jlm
jelmer at samba.org-20070206235608-980jutwyp43708k6
jelmer at samba.org-20070207185718-i1xx6bvmdeeii72p
jelmer at samba.org-20070208234639-i0h5mfefbn1a1lkl
jelmer at samba.org-20070209001154-lol5huzwdq9jw2e7
jelmer at samba.org-20070209093351-buzkh0t55nt863gw
jelmer at samba.org-20070212120516-lwfxtpxx1lerwro2
jelmer at samba.org-20070212130037-e7t2bh0ufajvi8m6
jelmer at samba.org-20070212173050-hpr37tn9ws2zhfko
jelmer at samba.org-20070214123932-nmsy6lnin8gtzxrn
jelmer at samba.org-20070214141810-0df8ykq1d0dl6yia
jelmer at samba.org-20070214143534-pc63vqrp827s6sdo
jelmer at samba.org-20070214145213-idzserezbwc2alty
jelmer at samba.org-20070214150805-zjdhqbtwy28fac3c
jelmer at samba.org-20070214192135-0yxxt5pto2lv4p4h
jelmer at samba.org-20070214213108-id4l0x9g95v6i060
jelmer at samba.org-20070215192824-a13ptx6qq150shoq
jelmer at samba.org-20070215210330-ve8q1mdkjymv6fr1
jelmer at samba.org-20070215220450-avh0rwc0ce0x7gja
jelmer at samba.org-20070215225539-cy8w0815ygz1wa0c
jelmer at samba.org-20070215234924-5u8bqtdp3ha66015
jelmer at samba.org-20070216003036-0ghop153wj46jjwe
jelmer at samba.org-20070216010504-03udexhmrhje5w5c
jelmer at samba.org-20070216124407-uwk21820sjr6n46p
jelmer at samba.org-20070216141029-nf84hlj2tr39ealw
jelmer at samba.org-20070216151123-m8lw5r1ebhymw8ba
jelmer at samba.org-20070217013108-znc8d1w6rtx0kaqf
jelmer at samba.org-20070217135603-92hi5qaxrxwoqulu
jelmer at samba.org-20070217233534-x58078kx0zci6831
jelmer at samba.org-20070218003055-80z3rswwe279yelu
jelmer at samba.org-20070218003815-07xijfqrcx3tybfi
jelmer at samba.org-20070218010222-fe4oase328jeg840
jelmer at samba.org-20070218115359-jytly04u0aufe8vn
jelmer at samba.org-20070218115806-9h8thqvb95iffgh5
jelmer at samba.org-20070218120236-9q5wvlctgevr438d
jelmer at samba.org-20070218120857-cg7f6ppc1b3jd2nj
jelmer at samba.org-20070218122007-5c147i8tk17nh31s
jelmer at samba.org-20070218125126-mq0gsnn6mdt0dr5p
jelmer at samba.org-20070218133855-zz8l3b16rc7rh5n9
jelmer at samba.org-20070218134908-r7jzuwppx6odzgao
jelmer at samba.org-20070218161231-qs4bbg2mkz3lo6rf
jelmer at samba.org-20070218164355-wcsqzlh7s37se8xk
jelmer at samba.org-20070218165112-edgr3gi0gg7aaqlj
jelmer at samba.org-20070218183655-2qk7xgjc222tls7y
jelmer at samba.org-20070218234351-nxjnkhl4bc4x00df
jelmer at samba.org-20070218235514-ziine4dmb38u0xv3
jelmer at samba.org-20070219004515-smmtdyy6deud4adv
jelmer at samba.org-20070219014759-jv5otc3ij03d89va
jelmer at samba.org-20070219192807-w8shsv06u698i3du
jelmer at samba.org-20070219212917-syg7v8ejwpfa8grh
jelmer at samba.org-20070219220607-f2xy405hjsim9l4p
jelmer at samba.org-20070219230825-to4yp0eswh2gd283
jelmer at samba.org-20070220012443-ky7aj0q1ra0t1ivl
jelmer at samba.org-20070220224521-cwtsy3lkbyppctj6
jelmer at samba.org-20070220231211-pizf7rowfbhdws2n
jelmer at samba.org-20070221102807-1eot92jt41ax1dg5
jelmer at samba.org-20070221103458-93itdwtzjmxk4o41
jelmer at samba.org-20070221105255-dfi4vebkw1x35m8j
jelmer at samba.org-20070221113036-clajwiyqor6weyhh
jelmer at samba.org-20070221114205-6e61yds88np0hzuw
jelmer at samba.org-20070221114904-3wvjhp50c49ad6gj

   + jelmer at samba.org-20060824212938-5923465160f6ab63
jelmer at samba.org-20060830112659-186f132eebc987cc
jelmer at samba.org-20060904121718-63b73248146c14f8
jelmer at samba.org-20060904124721-5e70ab0bd405f748
metze at samba.org-20061010151401-45a5a2ed52cfe172
jelmer at samba.org-20061016130323-400ce51ee51ab30e
jelmer at samba.org-20061016195822-c7783d3ea1a56a53
jelmer at samba.org-20061016230421-75bca2ad62945ede
jelmer at samba.org-20061017145110-8c83a3dd979f6a6a
jelmer at samba.org-20061029173623-eb0459f1d3eb5720
jelmer at samba.org-20070115022006-h5ef1deqflt940b6
jelmer at samba.org-20070116142934-hv99dpwbnq2znh8f
jelmer at samba.org-20070116144126-70rip3bppmvgs3t6
jelmer at samba.org-20070116151516-imvui4r33cj850j9
jelmer at samba.org-20070116154739-3tji4fft7964qgrj
jelmer at samba.org-20070116173900-iasa25stcfty6pbr
jelmer at samba.org-20070117144550-te3o0iy10y14iyo4
jelmer at samba.org-20070122000024-q911packyrjk69ud
jelmer at samba.org-20070122181120-3n8ah238pjbzylyo
jelmer at samba.org-20070122182054-6b26fqrdqyjhyeuc
jelmer at samba.org-20070122233549-k085tfo2o1eqz7mm
jelmer at samba.org-20070123002251-0smz35eva10x84tc
jelmer at samba.org-20070123003546-p0jl6j9tw79q5j1k
jelmer at samba.org-20070123012404-o9w5pmgkm94zsxlu
jelmer at samba.org-20070123094731-ns7dzzzqtb0dlcod
jelmer at samba.org-20070125123431-g3pqm92r31ez9xyc
jelmer at samba.org-20070126125959-3w3t26aps9hmwukv
jelmer at samba.org-20070126132607-64kt7rc2wtqh0c7u
jelmer at samba.org-20070126133903-onfotbg1051ktojo
jelmer at samba.org-20070126144259-171b4t0744jigs5x
jelmer at samba.org-20070126152205-xj7j1avc7683rjy5
jelmer at samba.org-20070128010235-e8st47gcy00ii8kc
jelmer at samba.org-20070128130853-xjjrlrtf830pwnx6
jelmer at samba.org-20070130120806-gfqshokma9j6j3uv
jelmer at samba.org-20070131002510-55yxynmb1o4zvx0x
jelmer at samba.org-20070131115042-oocen3olfgu53jlm
jelmer at samba.org-20070206235608-980jutwyp43708k6
jelmer at samba.org-20070207185718-i1xx6bvmdeeii72p
jelmer at samba.org-20070208234639-i0h5mfefbn1a1lkl
jelmer at samba.org-20070209001154-lol5huzwdq9jw2e7
jelmer at samba.org-20070209093351-buzkh0t55nt863gw
jelmer at samba.org-20070212120516-lwfxtpxx1lerwro2
jelmer at samba.org-20070212130037-e7t2bh0ufajvi8m6
jelmer at samba.org-20070212173050-hpr37tn9ws2zhfko
jelmer at samba.org-20070214123932-nmsy6lnin8gtzxrn
jelmer at samba.org-20070214141810-0df8ykq1d0dl6yia
jelmer at samba.org-20070214143534-pc63vqrp827s6sdo
jelmer at samba.org-20070214145213-idzserezbwc2alty
jelmer at samba.org-20070214150805-zjdhqbtwy28fac3c
jelmer at samba.org-20070214192135-0yxxt5pto2lv4p4h
jelmer at samba.org-20070214213108-id4l0x9g95v6i060
jelmer at samba.org-20070215192824-a13ptx6qq150shoq
jelmer at samba.org-20070215210330-ve8q1mdkjymv6fr1
jelmer at samba.org-20070215220450-avh0rwc0ce0x7gja
jelmer at samba.org-20070215225539-cy8w0815ygz1wa0c
jelmer at samba.org-20070215234924-5u8bqtdp3ha66015
jelmer at samba.org-20070216003036-0ghop153wj46jjwe
jelmer at samba.org-20070216010504-03udexhmrhje5w5c
jelmer at samba.org-20070216124407-uwk21820sjr6n46p
jelmer at samba.org-20070216141029-nf84hlj2tr39ealw
jelmer at samba.org-20070216151123-m8lw5r1ebhymw8ba
jelmer at samba.org-20070217013108-znc8d1w6rtx0kaqf
jelmer at samba.org-20070217135603-92hi5qaxrxwoqulu
jelmer at samba.org-20070217233534-x58078kx0zci6831
jelmer at samba.org-20070218003055-80z3rswwe279yelu
jelmer at samba.org-20070218003815-07xijfqrcx3tybfi
jelmer at samba.org-20070218010222-fe4oase328jeg840
jelmer at samba.org-20070218115359-jytly04u0aufe8vn
jelmer at samba.org-20070218115806-9h8thqvb95iffgh5
jelmer at samba.org-20070218120236-9q5wvlctgevr438d
jelmer at samba.org-20070218120857-cg7f6ppc1b3jd2nj
jelmer at samba.org-20070218122007-5c147i8tk17nh31s
jelmer at samba.org-20070218125126-mq0gsnn6mdt0dr5p
jelmer at samba.org-20070218133855-zz8l3b16rc7rh5n9
jelmer at samba.org-20070218134908-r7jzuwppx6odzgao
jelmer at samba.org-20070218161231-qs4bbg2mkz3lo6rf
jelmer at samba.org-20070218164355-wcsqzlh7s37se8xk
jelmer at samba.org-20070218165112-edgr3gi0gg7aaqlj
jelmer at samba.org-20070218183655-2qk7xgjc222tls7y
jelmer at samba.org-20070218234351-nxjnkhl4bc4x00df
jelmer at samba.org-20070218235514-ziine4dmb38u0xv3
jelmer at samba.org-20070219004515-smmtdyy6deud4adv
jelmer at samba.org-20070219014759-jv5otc3ij03d89va
jelmer at samba.org-20070219192807-w8shsv06u698i3du
jelmer at samba.org-20070219212917-syg7v8ejwpfa8grh
jelmer at samba.org-20070219220607-f2xy405hjsim9l4p
jelmer at samba.org-20070219230825-to4yp0eswh2gd283
jelmer at samba.org-20070220012443-ky7aj0q1ra0t1ivl
jelmer at samba.org-20070220224521-cwtsy3lkbyppctj6
jelmer at samba.org-20070220231211-pizf7rowfbhdws2n
jelmer at samba.org-20070221102807-1eot92jt41ax1dg5
jelmer at samba.org-20070221103458-93itdwtzjmxk4o41
jelmer at samba.org-20070221105255-dfi4vebkw1x35m8j
jelmer at samba.org-20070221113036-clajwiyqor6weyhh
jelmer at samba.org-20070221114205-6e61yds88np0hzuw
jelmer at samba.org-20070221114904-3wvjhp50c49ad6gj
jelmer at samba.org-20070221123127-0131p4yw87krxoif


Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm	2007-02-21 11:51:51 UTC (rev 21489)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm	2007-02-21 12:35:21 UTC (rev 21490)
@@ -6,16 +6,23 @@
 
 package Parse::Pidl::Samba4::EJS;
 
+use Exporter;
+ at ISA = qw(Exporter);
+ at EXPORT_OK = qw(get_pointer_to get_value_of check_null_pointer $res
+                $res_hdr fn_declare);
+
 use strict;
 use Parse::Pidl::Typelist;
 use Parse::Pidl::Util qw(has_property ParseExpr);
 use Parse::Pidl::NDR qw(GetPrevLevel GetNextLevel);
+use Parse::Pidl::Samba4::NDR::Parser qw(GenerateStructEnv GenerateFunctionInEnv
+                                        GenerateFunctionOutEnv);
 
 use vars qw($VERSION);
 $VERSION = '0.01';
 
-my $res;
-my $res_hdr;
+our $res;
+our $res_hdr;
 
 my %constants;
 
@@ -46,52 +53,6 @@
 	$tabs = substr($tabs, 0, -1);
 }
 
-sub GenerateStructEnv($)
-{
-	my $x = shift;
-	my %env;
-
-	foreach my $e (@{$x->{ELEMENTS}}) {
-		if ($e->{NAME}) {
-			$env{$e->{NAME}} = "r->$e->{NAME}";
-		}
-	}
-
-	$env{"this"} = "r";
-
-	return \%env;
-}
-
-sub GenerateFunctionInEnv($)
-{
-	my $fn = shift;
-	my %env;
-
-	foreach my $e (@{$fn->{ELEMENTS}}) {
-		if (grep (/in/, @{$e->{DIRECTION}})) {
-			$env{$e->{NAME}} = "r->in.$e->{NAME}";
-		}
-	}
-
-	return \%env;
-}
-
-sub GenerateFunctionOutEnv($)
-{
-	my $fn = shift;
-	my %env;
-
-	foreach my $e (@{$fn->{ELEMENTS}}) {
-		if (grep (/out/, @{$e->{DIRECTION}})) {
-			$env{$e->{NAME}} = "r->out.$e->{NAME}";
-		} elsif (grep (/in/, @{$e->{DIRECTION}})) {
-			$env{$e->{NAME}} = "r->in.$e->{NAME}";
-		}
-	}
-
-	return \%env;
-}
-
 sub get_pointer_to($)
 {
 	my $var_name = shift;
@@ -127,7 +88,6 @@
 	}
 }
 
-
 #####################################################################
 # work out is a parse function should be declared static or not
 sub fn_declare($$)
@@ -291,7 +251,7 @@
 sub EjsStructPull($$)
 {
 	my ($name, $d) = @_;
-	my $env = GenerateStructEnv($d);
+	my $env = GenerateStructEnv($d, "r");
 	fn_declare($d, "NTSTATUS ejs_pull_$name(struct ejs_rpc *ejs, struct MprVar *v, const char *name, struct $name *r)");
 	pidl "{";
 	indent;
@@ -391,7 +351,6 @@
 	pidl "}";
 }
 
-
 ###########################
 # generate a structure pull
 sub EjsTypedefPull($)
@@ -580,7 +539,7 @@
 sub EjsStructPush($$)
 {
 	my ($name, $d) = @_;
-	my $env = GenerateStructEnv($d);
+	my $env = GenerateStructEnv($d, "r");
 	fn_declare($d, "NTSTATUS ejs_push_$name(struct ejs_rpc *ejs, struct MprVar *v, const char *name, const struct $name *r)");
 	pidl "{";
 	indent;
@@ -879,32 +838,25 @@
 	}
 }
 
-sub NeededTypedef($$)
+sub NeededType($$$)
 {
-	my ($t,$needed) = @_;
+	sub NeededType($$$);
+	my ($t,$needed,$req) = @_;
 
-	if (has_property($t, "public")) {
-		$needed->{"pull_$t->{NAME}"} = not has_property($t, "noejs");
-		$needed->{"push_$t->{NAME}"} = not has_property($t, "noejs");
-	}
+	NeededType($t->{DATA}, $needed, $req) if ($t->{TYPE} eq "TYPEDEF");
 
-	return if (($t->{DATA}->{TYPE} ne "STRUCT") and 
-			   ($t->{DATA}->{TYPE} ne "UNION"));
+	return if (($t->{TYPE} ne "STRUCT") and 
+			   ($t->{TYPE} ne "UNION"));
 
-	foreach (@{$t->{DATA}->{ELEMENTS}}) {
+	foreach (@{$t->{ELEMENTS}}) {
 		next if (has_property($_, "subcontext")); #FIXME: Support subcontexts
 		my $n;
-		if (ref($_->{TYPE}) eq "HASH") {
-			$n = "$_->{TYPE}->{TYPE}_$_->{TYPE}->{NAME}";
-		} else {
-			$n = $_->{TYPE};
+		if (ref($_->{TYPE}) eq "HASH" and defined($_->{TYPE}->{NAME})) {
+			$needed->{"$req\_$_->{TYPE}->{TYPE}_$_->{TYPE}->{NAME}"} = 1;
+		} elsif (ref($_->{TYPE}) ne "HASH") {
+			$needed->{$req."_".$_->{TYPE}} = 1;
 		}
-		unless (defined($needed->{"pull_$n"})) {
-			$needed->{"pull_$n"} = $needed->{"pull_$t->{NAME}"};
-		}
-		unless (defined($needed->{"push_$n"})) {
-			$needed->{"push_$n"} = $needed->{"push_$t->{NAME}"};
-		}
+		NeededType($_->{TYPE}, $needed, $req) if (ref($_->{TYPE}) eq "HASH");
 	}
 }
 
@@ -915,7 +867,16 @@
 	my ($interface,$needed) = @_;
 
 	NeededFunction($_, $needed) foreach (@{$interface->{FUNCTIONS}});
-	NeededTypedef($_, $needed) foreach (reverse @{$interface->{TYPES}});
+
+	foreach (reverse @{$interface->{TYPES}}) {
+		if (has_property($_, "public")) {
+			$needed->{"pull_$_->{NAME}"} = not has_property($_, "noejs");
+			$needed->{"push_$_->{NAME}"} = not has_property($_, "noejs");
+		}
+
+		NeededType($_, $needed, "pull")  if ($needed->{"pull_$_->{NAME}"});
+		NeededType($_, $needed, "push")  if ($needed->{"push_$_->{NAME}"});
+	}
 }
 
 1;

Added: branches/SAMBA_4_0/source/pidl/tests/samba-ejs.pl
===================================================================
--- branches/SAMBA_4_0/source/pidl/tests/samba-ejs.pl	2007-02-21 11:51:51 UTC (rev 21489)
+++ branches/SAMBA_4_0/source/pidl/tests/samba-ejs.pl	2007-02-21 12:35:21 UTC (rev 21490)
@@ -0,0 +1,42 @@
+#!/usr/bin/perl
+# (C) 2007 Jelmer Vernooij <jelmer at samba.org>
+# Published under the GNU General Public License
+use strict;
+use warnings;
+
+use Test::More tests => 13;
+use FindBin qw($RealBin);
+use lib "$RealBin";
+use Util;
+use Parse::Pidl::Util qw(MyDumper);
+use Parse::Pidl::Samba4::EJS qw(get_pointer_to get_value_of check_null_pointer
+        $res $res_hdr fn_declare);
+
+is("&foo", get_pointer_to("foo"));
+is("&(&foo)", get_pointer_to(get_pointer_to("foo")));
+is("*foo", get_pointer_to("**foo"));
+is("foo", get_pointer_to("*foo"));
+
+is("foo", get_value_of("&foo"));
+is("*foo", get_value_of("foo"));
+is("**foo", get_value_of("*foo"));
+
+$res = "";
+check_null_pointer("bla");
+is($res, "");
+
+$res = "";
+check_null_pointer("*bla");
+is($res, "if (bla == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;\n");
+
+$res = "";
+$res_hdr = "";
+fn_declare({ PROPERTIES => { public => 1 } }, "myproto(int x)");
+is($res, "_PUBLIC_ myproto(int x)\n");
+is($res_hdr, "myproto(int x);\n");
+
+$res = "";
+$res_hdr = "";
+fn_declare({ PROPERTIES => {} }, "mybla(int foo)");
+is($res, "static mybla(int foo)\n");
+is($res_hdr, "");


Property changes on: branches/SAMBA_4_0/source/pidl/tests/samba-ejs.pl
___________________________________________________________________
Name: svn:executable
   + *



More information about the samba-cvs mailing list