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 58d95eff3960576a446317f5d2228eb2ea89c5c8..a662ed005ef8f6435baacd085d2b7a04cd76ecb8 100644 (file)
--- a/source4/build/pidl/util.pm
+++ b/source4/build/pidl/util.pm
@@ -200,86 +200,6 @@ sub property_matches($$$)
        return undef;
 }
 
-my %enum_list;
-
-sub register_enum($$)
-{
-       my $enum = shift;
-       my $name = shift;
-       $enum_list{$name} = $enum;
-}
-
-sub is_enum($)
-{
-       my $name = shift;
-       return defined $enum_list{$name}
-}
-
-sub get_enum($)
-{
-       my $name = shift;
-       return $enum_list{$name};
-}
-
-sub enum_type_decl($)
-{
-       my $enum = shift;
-       return "enum $enum->{TYPE}";
-}
-
-sub enum_type_fn($)
-{
-       my $enum = shift;
-       if (util::has_property($enum->{PARENT}, "enum8bit")) {
-               return "uint8";
-       } elsif (util::has_property($enum->{PARENT}, "v1_enum")) {
-               return "uint32";
-       }
-       return "uint16";
-}
-
-my %bitmap_list;
-
-sub register_bitmap($$)
-{
-       my $bitmap = shift;
-       my $name = shift;
-       $bitmap_list{$name} = $bitmap;
-}
-
-sub is_bitmap($)
-{
-       my $name = shift;
-       return defined $bitmap_list{$name};
-}
-
-sub get_bitmap($)
-{
-       my $name = shift;
-       return $bitmap_list{$name};
-}
-
-sub bitmap_type_fn($)
-{
-       my $bitmap = shift;
-
-       if (util::has_property($bitmap->{PARENT}, "bitmap8bit")) {
-               return "uint8";
-       } elsif (util::has_property($bitmap->{PARENT}, "bitmap16bit")) {
-               return "uint16";
-       } elsif (util::has_property($bitmap->{PARENT}, "bitmap64bit")) {
-               return "uint64";
-       }
-       return "uint32";
-}
-
-sub bitmap_type_decl($)
-{
-       my $bitmap = shift;
-       return map_type(bitmap_type_fn($bitmap));
-}
-
-
 # determine if an element is a pass-by-reference structure
 sub is_ref_struct($)
 {
@@ -316,29 +236,6 @@ sub is_constant($)
        return 0;
 }
 
-# return 1 if this is a fixed array
-sub is_fixed_array($)
-{
-       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;
-       }
-       return 0;
-}
-
 # return a "" quoted string, unless already quoted
 sub make_str($)
 {
@@ -349,37 +246,4 @@ sub make_str($)
        return "\"" . $str . "\"";
 }
 
-
-# provide mappings between IDL base types and types in our headers
-my %type_mappings = 
-    (
-     "int8"         => "int8_t",
-     "uint8"        => "uint8_t",
-     "short"        => "int16_t",
-     "wchar_t"      => "uint16_t",
-     "int16"        => "int16_t",
-     "uint16"       => "uint16_t",
-     "int32"        => "int32_t",
-     "uint32"       => "uint32_t",
-     "int64"        => "int64_t",
-     "uint64"       => "uint64_t",
-     "dlong"        => "int64_t",
-     "udlong"       => "uint64_t",
-     "hyper"        => "uint64_t",
-     "NTTIME_1sec"  => "NTTIME",
-     "NTTIME_hyper" => "NTTIME",
-     "ipv4address"  => "const char *"
-     );
-
-# map from a IDL type to a C header type
-sub map_type($)
-{
-       my $name = shift;
-       if (my $ret = $type_mappings{$name}) {
-               return $ret;
-       }
-       return $name;
-}
-
 1;
-