r8213: I've started to understand the LEVELS stuff in pidl much better now,

and have re-coded the push side of the ejs generator to use it
properly. It ends up being very neat and small, and should handle much
more complex structures (like arrays of pointers to unions etc).

Also added push side support for unions. This should get more of the
echo pipe working via ejs.
(This used to be commit 2e306be1d83f722c259c4a63233e77d8bb1d5a72)

3 files changed, 106 insertions, 82 deletions

diff --git a/source4/build/pidl/ejs.pm b/source4/build/pidl/ejs.pm
index e983a5ce49..db8db00014 100644
--- a/source4/build/pidl/ejs.pm
+++ b/source4/build/pidl/ejs.pm
@@ -23,7 +23,9 @@ sub GenerateStructEnv($)
 	my %env;
 
 	foreach my $e (@{$x->{ELEMENTS}}) {
-		$env{$e->{NAME}} = "r->$e->{NAME}";
+		if ($e->{NAME}) {
+			$env{$e->{NAME}} = "r->$e->{NAME}";
+		}
 	}
 
 	$env{"this"} = "r";
@@ -184,6 +186,13 @@ sub EjsEnumPull($$)
 	pidl "}\n\n";
 }
 
+###########################
+# pull a bitmap
+sub EjsBitmapPull($$)
+{
+# ignored for now
+}
+
 
 ###########################
 # generate a structure pull
@@ -196,8 +205,10 @@ sub EjsTypedefPull($)
 		EjsUnionPull($d->{NAME}, $d->{DATA});
 	} elsif ($d->{DATA}->{TYPE} eq 'ENUM') {
 		EjsEnumPull($d->{NAME}, $d->{DATA});
+	} elsif ($d->{DATA}->{TYPE} eq 'BITMAP') {
+		EjsBitmapPull($d->{NAME}, $d->{DATA});
 	} else {
-		warn "Unhandled pull typedef $d->{NAME} of type $d->{TYPE}\n";
+		warn "Unhandled pull typedef $d->{NAME} of type $d->{DATA}->{TYPE}\n";
 	}
 }
 
@@ -225,83 +236,87 @@ sub EjsPullFunction($)
 
 
 ###########################
-# pull a scalar element
-sub EjsPushScalar($$$)
+# push a scalar element
+sub EjsPushScalar($$$$$)
 {
-	my $e = shift;
-	my $l = shift;
-	my $env = shift;
-	my $var = util::ParseExpr($e->{NAME}, $env);
-
+	my ($e, $l, $var, $name, $env) = @_;
 	$var = get_pointer_to($var);
-
-	pidl "\tNDR_CHECK(ejs_push_$e->{TYPE}(ejs, v, \"$e->{NAME}\", $var));\n";
+	pidl "\tNDR_CHECK(ejs_push_$e->{TYPE}(ejs, v, $name, $var));\n";
 }
 
 ###########################
-# pull a string element
-sub EjsPushString($$$)
+# push a string element
+sub EjsPushString($$$$$)
 {
-	my $e = shift;
-	my $l = shift;
-	my $env = shift;
-	my $var = util::ParseExpr($e->{NAME}, $env);
-
-	pidl "\tNDR_CHECK(ejs_push_string(ejs, v, \"$e->{NAME}\", $var));\n";
+	my ($e, $l, $var, $name, $env) = @_;
+	pidl "\tNDR_CHECK(ejs_push_string(ejs, v, $name, $var));\n";
 }
 
 ###########################
-# pull a pointer element
-sub EjsPushPointer($$$)
+# push a pointer element
+sub EjsPushPointer($$$$$)
 {
-	my $e = shift;
-	my $l = shift;
-	my $env = shift;
-	my $var = util::ParseExpr($e->{NAME}, $env);
-
-	while ($l->{TYPE} eq "POINTER") {
-		$var = get_value_of($var);
-		$l = Ndr::GetNextLevel($e, $l);
-	}
-	$var = get_pointer_to($var);		
+	my ($e, $l, $var, $name, $env) = @_;
+	$var = get_value_of($var);		
+	EjsPushElement($e, Ndr::GetNextLevel($e, $l), $var, $name, $env);
+}
 
-	pidl "\tNDR_CHECK(ejs_push_$e->{TYPE}(ejs, v, \"$e->{NAME}\", $var));\n";
+###########################
+# push a switch element
+sub EjsPushSwitch($$$$$)
+{
+	my ($e, $l, $var, $name, $env) = @_;
+	my $switch_var = util::ParseExpr($l->{SWITCH_IS}, $env);
+	pidl "ejs_set_switch(ejs, $switch_var);\n";
+	EjsPushElement($e, Ndr::GetNextLevel($e, $l), $var, $name, $env);
 }
 
 
 ###########################
 # push an arrar element
 # only handles a very limited range of array types so far
-sub EjsPushArray($$$)
+sub EjsPushArray($$$$$)
 {
-	my $e = shift;
-	my $l = shift;
-	my $env = shift;
+	my ($e, $l, $var, $name, $env) = @_;
 	my $length = util::ParseExpr($l->{LENGTH_IS}, $env);
-	my $var = util::ParseExpr($e->{NAME}, $env);
-	pidl "\tNDR_CHECK(ejs_push_array(ejs, v, \"$e->{NAME}\", $length, sizeof($var\[0]), (void *)$var, (ejs_push_t)ejs_push_$e->{TYPE}));\n";
+	pidl "{ uint32_t i; for (i=0;i<$length;i++) {\n";
+	pidl "\tconst char *id = talloc_asprintf(ejs, \"%s.%u\", $name, i);\n";
+	EjsPushElement($e, Ndr::GetNextLevel($e, $l), $var . "[i]", "id", $env);
+	pidl "}\nejs_push_uint32(ejs, v, $name \".length\", &i); }\n";
 }
 
-###########################
-# push a structure element
-sub EjsPushElement($$)
+################################
+# push a structure/union element
+sub EjsPushElement($$$$$)
 {
-	my $e = shift;
-	my $env = shift;
-	my $l = $e->{LEVELS}[0];
+	my ($e, $l, $var, $name, $env) = @_;
 	if (util::has_property($e, "charset")) {
-		EjsPushString($e, $l, $env);
+		EjsPushString($e, $l, $var, $name, $env);
 	} elsif ($l->{TYPE} eq "ARRAY") {
-		EjsPushArray($e, $l, $env);
+		EjsPushArray($e, $l, $var, $name, $env);
 	} elsif ($l->{TYPE} eq "DATA") {
-		EjsPushScalar($e, $l, $env);
+		EjsPushScalar($e, $l, $var, $name, $env);
 	} elsif (($l->{TYPE} eq "POINTER")) {
-		EjsPushPointer($e, $l, $env);
+		EjsPushPointer($e, $l, $var, $name, $env);
+	} elsif (($l->{TYPE} eq "SWITCH")) {
+		EjsPushSwitch($e, $l, $var, $name, $env);
 	} else {
 		pidl "return ejs_panic(ejs, \"unhandled push type $l->{TYPE}\");\n";
 	}
 }
 
+#############################################
+# push a structure/union element at top level
+sub EjsPushElementTop($$)
+{
+	my $e = shift;
+	my $env = shift;
+	my $l = $e->{LEVELS}[0];
+	my $var = util::ParseExpr($e->{NAME}, $env);
+	my $name = "\"$e->{NAME}\"";
+	EjsPushElement($e, $l, $var, $name, $env);
+}
+
 ###########################
 # push a struct
 sub EjsStructPush($$)
@@ -312,7 +327,7 @@ sub EjsStructPush($$)
 	pidl "\nstatic NTSTATUS ejs_push_$name(struct ejs_rpc *ejs, struct MprVar *v, const char *name, const struct $name *r)\n{\n";
 	pidl "\tNDR_CHECK(ejs_push_struct_start(ejs, &v, name));\n";
         foreach my $e (@{$d->{ELEMENTS}}) {
-		EjsPushElement($e, $env);
+		EjsPushElementTop($e, $env);
 	}
 	pidl "\treturn NT_STATUS_OK;\n";
 	pidl "}\n\n";
@@ -324,9 +339,25 @@ sub EjsUnionPush($$)
 {
 	my $name = shift;
 	my $d = shift;
+	my $have_default = 0;
+	my $env = GenerateStructEnv($d);
 	pidl "\nstatic NTSTATUS ejs_push_$name(struct ejs_rpc *ejs, struct MprVar *v, const char *name, const union $name *r)\n{\n";
-	pidl "return ejs_panic(ejs, \"union push not handled\");\n";
-	pidl "}\n\n";
+	pidl "switch (ejs->switch_var) {\n";
+	foreach my $e (@{$d->{ELEMENTS}}) {
+		if ($e->{CASE} eq "default") {
+			$have_default = 1;
+		}
+		pidl "$e->{CASE}:";
+		if ($e->{TYPE} ne "EMPTY") {
+			EjsPushElementTop($e, $env);
+		}
+		pidl "break;\n";
+	}
+	if (! $have_default) {
+		pidl "default:";
+		pidl "\treturn ejs_panic(ejs, \"Bad switch value\");";
+	}
+	pidl "}\nreturn NT_STATUS_OK;\n}\n";
 }
 
 ###########################
@@ -342,6 +373,13 @@ sub EjsEnumPush($$)
 	pidl "}\n\n";
 }
 
+###########################
+# push a bitmap
+sub EjsBitmapPush($$)
+{
+	# ignored for now
+}
+
 
 ###########################
 # generate a structure push
@@ -354,8 +392,10 @@ sub EjsTypedefPush($)
 		EjsUnionPush($d->{NAME}, $d->{DATA});
 	} elsif ($d->{DATA}->{TYPE} eq 'ENUM') {
 		EjsEnumPush($d->{NAME}, $d->{DATA});
+	} elsif ($d->{DATA}->{TYPE} eq 'BITMAP') {
+		EjsBitmapPush($d->{NAME}, $d->{DATA});
 	} else {
-		warn "Unhandled push typedef $d->{NAME} of type $d->{TYPE}\n";
+		warn "Unhandled push typedef $d->{NAME} of type $d->{DATA}->{TYPE}\n";
 	}
 }
 
@@ -374,7 +414,7 @@ sub EjsPushFunction($)
 
 	foreach my $e (@{$d->{ELEMENTS}}) {
 		next unless (grep(/out/, @{$e->{DIRECTION}}));
-		EjsPushElement($e, $env);
+		EjsPushElementTop($e, $env);
 	}
 
 	pidl "\treturn NT_STATUS_OK;\n";
diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 75f748f146..965fd8d447 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -45,6 +45,13 @@ NTSTATUS ejs_push_rpc(int eid, const char *callname,
 	return ejs_push(ejs, v, ptr);
 }
 
+/*
+  set the switch var to be used by the next union switch
+*/
+void ejs_set_switch(struct ejs_rpc *ejs, uint32_t switch_var)
+{
+	ejs->switch_var = switch_var;
+}
 
 /*
   panic in the ejs wrapper code
@@ -274,34 +281,10 @@ NTSTATUS ejs_pull_array(struct ejs_rpc *ejs,
 
 
 /*
-  push an array of elements
-*/
-NTSTATUS ejs_push_array(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint32_t length,
-			size_t elsize, void *r, ejs_push_t ejs_push)
-{
-	int i;
-	char *data;
-
-	NDR_CHECK(ejs_push_struct_start(ejs, &v, name));
-
-	data = r;
-
-	for (i=0;i<length;i++) {
-		char *id = talloc_asprintf(ejs, "%u", i);
-		NT_STATUS_HAVE_NO_MEMORY(id);
-		NDR_CHECK(ejs_push(ejs, v, id, (i*elsize)+data));
-		talloc_free(id);
-	}
-	return mprSetVar(v, "length", mprCreateIntegerVar(i));
-}
-			
-
-/*
   pull a string
 */
 NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const char **s)
+			 struct MprVar *v, const char *name, char **s)
 {
 	struct MprVar *var;
 	var = mprGetVar(v, name);
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 5fb6ace863..67b81b3411 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -23,6 +23,9 @@
 struct ejs_rpc {
 	int eid;
 	const char *callname;
+	/* as ejs does only one pass, we can use a single var for switch 
+	   handling */
+	uint32_t switch_var;
 };
 
 typedef NTSTATUS (*ejs_pull_t)(struct ejs_rpc *, struct MprVar *, const char *, void *);
@@ -31,6 +34,7 @@ typedef NTSTATUS (*ejs_pull_function_t)(struct ejs_rpc *, struct MprVar *, void
 typedef NTSTATUS (*ejs_push_function_t)(struct ejs_rpc *, struct MprVar *, const void *);
 
 NTSTATUS ejs_panic(struct ejs_rpc *ejs, const char *why);
+void ejs_set_switch(struct ejs_rpc *ejs, uint32_t switch_var);
 
 int ejs_rpc_call(int eid, int argc, struct MprVar **argv, const char *callname,
 		 ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push);
@@ -63,10 +67,7 @@ NTSTATUS ejs_push_enum(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_array(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint32_t length,
 			size_t elsize, void **r, ejs_pull_t ejs_pull);
-NTSTATUS ejs_push_array(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint32_t length,
-			size_t elsize, void *r, ejs_push_t ejs_push);
 NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const char **s);
+			 struct MprVar *v, const char *name, char **s);
 NTSTATUS ejs_push_string(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, const char *s);