####################################################################
# work out the name of a size_is() variable
-sub find_size_var($$$)
+sub ParseExpr($$$)
{
my($e) = shift;
my($size) = shift;
}
#####################################################################
-# check that a variable we get from find_size_var isn't a null pointer
+# check that a variable we get from ParseExpr isn't a null pointer
sub check_null_pointer($)
{
my $size = shift;
}
#####################################################################
-# check that a variable we get from find_size_var isn't a null pointer
+# check that a variable we get from ParseExpr isn't a null pointer
# void return varient
sub check_null_pointer_void($)
{
my $dt = $typedefs{$e}->{DATA};
+ return $dt->{ALIGN} if ($dt->{ALIGN});
+
if ($dt->{TYPE} eq "STRUCT") {
- return struct_alignment($dt);
+ $dt->{ALIGN} = struct_alignment($dt);
} elsif($dt->{TYPE} eq "UNION") {
- return struct_alignment($dt);
+ $dt->{ALIGN} = struct_alignment($dt);
} elsif ($dt->{TYPE} eq "ENUM") {
- return align_type(util::enum_type_fn(util::get_enum($e)));
+ $dt->{ALIGN} = align_type(util::enum_type_fn(util::get_enum($e)));
} elsif ($dt->{TYPE} eq "BITMAP") {
- return align_type(util::bitmap_type_fn(util::get_bitmap($e)));
- } elsif ($dt->{TYPE} eq "SCALAR") {
- return $dt->{ALIGN};
- }
+ $dt->{ALIGN} = align_type(util::bitmap_type_fn(util::get_bitmap($e)));
+ }
- die("Internal pidl error. Typedef has unknown data type $dt->{TYPE}!");
+ if (not defined($dt->{ALIGN})) {
+ die("Internal pidl error. Unable to determine alignment for data type $dt->{TYPE}!");
+ }
+
+ return $dt->{ALIGN};
}
#####################################################################
my $var_prefix = shift;
my $ndr_flags = shift;
- my $size = find_size_var($e, util::array_size($e), $var_prefix);
+ my $size = ParseExpr($e, util::array_size($e), $var_prefix);
if (defined $e->{CONFORMANT_SIZE}) {
# the conformant size has already been pushed
}
if (my $length = util::has_property($e, "length_is")) {
- $length = find_size_var($e, $length, $var_prefix);
+ $length = ParseExpr($e, $length, $var_prefix);
pidl "\t\tNDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));\n";
pidl "\t\tNDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, $length));\n";
$size = $length;
{
my $e = shift;
my $var_prefix = shift;
- my $size = find_size_var($e, util::array_size($e), $var_prefix);
+ my $size = ParseExpr($e, util::array_size($e), $var_prefix);
my $length = util::has_property($e, "length_is");
if (defined $length) {
- $size = find_size_var($e, $length, $var_prefix);
+ $size = ParseExpr($e, $length, $var_prefix);
}
if (is_scalar_type($e->{TYPE})) {
if (!defined $e->{CONFORMANT_SIZE} &&
util::has_property($e, "size_is")) {
- my $size = find_size_var($e, util::array_size($e), $var_prefix);
+ my $size = ParseExpr($e, util::array_size($e), $var_prefix);
pidl "\tif ($var_prefix$e->{NAME}) {\n";
check_null_pointer($size);
pidl "\t\tNDR_CHECK(ndr_check_array_size(ndr, (void*)&$var_prefix$e->{NAME}, $size));\n";
}
if (my $length = util::has_property($e, "length_is")) {
- $length = find_size_var($e, $length, $var_prefix);
+ $length = ParseExpr($e, $length, $var_prefix);
pidl "\tif ($var_prefix$e->{NAME}) {\n";
check_null_pointer($length);
pidl "\t\tNDR_CHECK(ndr_check_array_length(ndr, (void*)&$var_prefix$e->{NAME}, $length));\n";
my $var_prefix = shift;
my $ndr_flags = shift;
- my $size = find_size_var($e, util::array_size($e), $var_prefix);
+ my $size = ParseExpr($e, util::array_size($e), $var_prefix);
my $alloc_size = $size;
# if this is a conformant array then we use that size to allocate, and make sure
my($var_prefix) = shift;
my($ndr_flags) = shift;
my $switch = shift;
- my $switch_var = find_size_var($e, $switch, $var_prefix);
+ my $switch_var = ParseExpr($e, $switch, $var_prefix);
my $cprefix = c_pull_prefix($e);
my($var_prefix) = shift;
my($ndr_flags) = shift;
my $switch = shift;
- my $switch_var = find_size_var($e, $switch, $var_prefix);
+ my $switch_var = ParseExpr($e, $switch, $var_prefix);
my $cprefix = c_push_prefix($e);
check_null_pointer($switch_var);
my($e) = shift;
my($var_prefix) = shift;
my $switch = shift;
- my $switch_var = find_size_var($e, $switch, $var_prefix);
+ my $switch_var = ParseExpr($e, $switch, $var_prefix);
my $cprefix = c_push_prefix($e);
check_null_pointer_void($switch_var);
# alignment)
my $e = $struct->{ELEMENTS}[-1];
if (defined $e->{ARRAY_LEN} && $e->{ARRAY_LEN} eq "*") {
- my $size = find_size_var($e, util::array_size($e), "r->");
+ my $size = ParseExpr($e, util::array_size($e), "r->");
$e->{CONFORMANT_SIZE} = $size;
check_null_pointer($size);
pidl "\tNDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, $size));\n";
}
# its an array
- my $size = find_size_var($e, $asize, "r->out.");
+ my $size = ParseExpr($e, $asize, "r->out.");
check_null_pointer($size);
pidl "\tNDR_ALLOC_N(ndr, r->out.$e->{NAME}, $size);\n";
if (util::has_property($e, "in")) {