r5475: Move some existing and new type information functions to typelist.pm

[samba.git] / source4 / build / pidl / util.pm

diff --git a/source4/build/pidl/util.pm b/source4/build/pidl/util.pm
index e3f3b0d40db452239339e1ed2ff2c0934342e6d6..a662ed005ef8f6435baacd085d2b7a04cd76ecb8 100644 (file)
--- a/source4/build/pidl/util.pm
+++ b/source4/build/pidl/util.pm
@@ -168,7 +168,7 @@ sub get_interface($$)
 }
 
 #####################################################################
-# see if a pidl property list contains a give property
+# see if a pidl property list contains a given property
 sub has_property($$)
 {
        my($e) = shift;
@@ -181,69 +181,22 @@ sub has_property($$)
        return $e->{PROPERTIES}->{$p};
 }
 
-
-sub is_scalar_type($)
-{
-    my($type) = shift;
-
-    if ($type =~ /^u?int\d+/) {
-           return 1;
-    }
-    if ($type =~ /char|short|long|NTTIME|
-       time_t|error_status_t|boolean32|unsigned32|
-       HYPER_T|wchar_t|DATA_BLOB/x) {
-           return 1;
-    }
-
-    return 0;
-}
-
-# return the NDR alignment for a type
-sub type_align($)
-{
-    my($e) = shift;
-    my $type = $e->{TYPE};
-
-    if (need_wire_pointer($e)) {
-           return 4;
-    }
-
-    return 4, if ($type eq "uint32");
-    return 4, if ($type eq "long");
-    return 2, if ($type eq "short");
-    return 1, if ($type eq "char");
-    return 1, if ($type eq "uint8");
-    return 2, if ($type eq "uint16");
-    return 4, if ($type eq "NTTIME");
-    return 4, if ($type eq "time_t");
-    return 8, if ($type eq "HYPER_T");
-    return 2, if ($type eq "wchar_t");
-    return 4, if ($type eq "DATA_BLOB");
-
-    # it must be an external type - all we can do is guess 
-    return 4;
-}
-
-# this is used to determine if the ndr push/pull functions will need
-# a ndr_flags field to split by buffers/scalars
-sub is_builtin_type($)
+#####################################################################
+# see if a pidl property matches a value
+sub property_matches($$$)
 {
-    my($type) = shift;
-
-    return 1, if (is_scalar_type($type));
+       my($e) = shift;
+       my($p) = shift;
+       my($v) = shift;
 
-    return 0;
-}
+       if (!defined has_property($e, $p)) {
+               return undef;
+       }
 
-# determine if an element needs a reference pointer on the wire
-# in its NDR representation
-sub need_wire_pointer($)
-{
-       my $e = shift;
-       if ($e->{POINTERS} && 
-           !has_property($e, "ref")) {
-               return $e->{POINTERS};
+       if ($e->{PROPERTIES}->{$p} =~ /$v/) {
+               return 1;
        }
+
        return undef;
 }
 
@@ -258,22 +211,6 @@ sub is_ref_struct($)
        return 0;
 }
 
-# determine if an element is a pure scalar. pure scalars do not
-# have a "buffers" section in NDR
-sub is_pure_scalar($)
-{
-       my $e = shift;
-       if (has_property($e, "ref")) {
-               return 1;
-       }
-       if (is_scalar_type($e->{TYPE}) && 
-           !$e->{POINTERS} && 
-           !array_size($e)) {
-               return 1;
-       }
-       return 0;
-}
-
 # determine the array size (size_is() or ARRAY_LEN)
 sub array_size($)
 {
@@ -289,73 +226,6 @@ sub array_size($)
        return undef;
 }
 
-# see if a variable needs to be allocated by the NDR subsystem on pull
-sub need_alloc($)
-{
-       my $e = shift;
-
-       if (has_property($e, "ref")) {
-               return 0;
-       }
-
-       if ($e->{POINTERS} || array_size($e)) {
-               return 1;
-       }
-
-       return 0;
-}
-
-# determine the C prefix used to refer to a variable when passing to a push
-# function. This will be '*' for pointers to scalar types, '' for scalar
-# types and normal pointers and '&' for pass-by-reference structures
-sub c_push_prefix($)
-{
-       my $e = shift;
-
-       if ($e->{TYPE} =~ "string") {
-               return "";
-       }
-
-       if (is_scalar_type($e->{TYPE}) &&
-           $e->{POINTERS}) {
-               return "*";
-       }
-       if (!is_scalar_type($e->{TYPE}) &&
-           !$e->{POINTERS} &&
-           !array_size($e)) {
-               return "&";
-       }
-       return "";
-}
-
-
-# determine the C prefix used to refer to a variable when passing to a pull
-# return '&' or ''
-sub c_pull_prefix($)
-{
-       my $e = shift;
-
-       if (!$e->{POINTERS} && !array_size($e)) {
-               return "&";
-       }
-
-       if ($e->{TYPE} =~ "string") {
-               return "&";
-       }
-
-       return "";
-}
-
-# determine if an element has a direct buffers component
-sub has_direct_buffers($)
-{
-       my $e = shift;
-       if ($e->{POINTERS} || array_size($e)) {
-               return 1;
-       }
-       return 0;
-}
-
 # return 1 if the string is a C constant
 sub is_constant($)
 {
@@ -366,28 +236,14 @@ sub is_constant($)
        return 0;
 }
 
-# return 1 if this is a fixed array
-sub is_fixed_array($)
+# return a "" quoted string, unless already quoted
+sub make_str($)
 {
-       my $e = shift;
-       my $len = $e->{"ARRAY_LEN"};
-       if (defined $len && is_constant($len)) {
-               return 1;
-       }
-       return 0;
-}
-
-# return 1 if this is a inline array
-sub is_inline_array($)
-{
-       my $e = shift;
-       my $len = $e->{"ARRAY_LEN"};
-       if (is_fixed_array($e) ||
-           defined $len && $len ne "*") {
-               return 1;
+       my $str = shift;
+       if (substr($str, 0, 1) eq "\"") {
+               return $str;
        }
-       return 0;
+       return "\"" . $str . "\"";
 }
 
 1;
-