r14215: Improve warning/error messages.

(This used to be commit 80b9865b373ee542da2d56d6688b4c8fd4c6275c)

diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/Client.pm b/source4/pidl/lib/Parse/Pidl/Samba3/Client.pm
index ceeb81c3d7894bae6aba4351b522ae229578492c..59f0341d022c94ab71f650fd7533710ffafa6f89 100644 (file)
--- a/source4/pidl/lib/Parse/Pidl/Samba3/Client.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba3/Client.pm
@@ -19,8 +19,8 @@ my $tabs = "";
 sub indent() { $tabs.="\t"; }
 sub deindent() { $tabs = substr($tabs, 1); }
 sub pidl($) { $res .= $tabs.(shift)."\n"; }
-sub fatal($$) { my ($e,$s) = @_; die("$e->{FILE}:$e->{LINE}: $s\n"); }
-sub warning($$) { my ($e,$s) = @_; warn("$e->{FILE}:$e->{LINE}: $s\n"); }
+sub fatal($$) { my ($e,$s) = @_; die("$e->{ORIGINAL}->{FILE}:$e->{ORIGINAL}->{LINE}: $s\n"); }
+sub warning($$) { my ($e,$s) = @_; warn("$e->{ORIGINAL}->{FILE}:$e->{ORIGINAL}->{LINE}: $s\n"); }
 
 sub CopyLevel($$$$)
 {

diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba3/Header.pm
index fb02120a42e5ab62c82885d13dcd267078d6c09c..480a6c8e4411d64da5bc2a1e1fdfbb8798d2bac0 100644 (file)
--- a/source4/pidl/lib/Parse/Pidl/Samba3/Header.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba3/Header.pm
@@ -19,8 +19,8 @@ my $tabs = "";
 sub indent() { $tabs.="\t"; }
 sub deindent() { $tabs = substr($tabs, 1); }
 sub pidl($) { $res .= $tabs.(shift)."\n"; }
-sub fatal($$) { my ($e,$s) = @_; die("$e->{FILE}:$e->{LINE}: $s\n"); }
-sub warning($$) { my ($e,$s) = @_; warn("$e->{FILE}:$e->{LINE}: $s\n"); }
+sub fatal($$) { my ($e,$s) = @_; die("$e->{ORIGINAL}->{FILE}:$e->{ORIGINAL}->{LINE}: $s\n"); }
+sub warning($$) { my ($e,$s) = @_; warn("$e->{ORIGINAL}->{FILE}:$e->{ORIGINAL}->{LINE}: $s\n"); }
 
 sub ParseElement($)
 {

diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm
index c12f7554e9ad312fe31ad7ad2e82e02b10ced294..a6b4b38cdf2d4c4290f5d5f2809aaa6051a0ce1f 100644 (file)
--- a/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm
@@ -22,7 +22,7 @@ my $tabs = "";
 sub indent() { $tabs.="\t"; }
 sub deindent() { $tabs = substr($tabs, 1); }
 sub pidl($) { $res .= $tabs.(shift)."\n"; }
-sub fatal($$) { my ($e,$s) = @_; die("$e->{FILE}:$e->{LINE}: $s\n"); }
+sub fatal($$) { my ($e,$s) = @_; die("$e->{ORIGINAL}->{FILE}:$e->{ORIGINAL}->{LINE}: $s\n"); }
 
 #TODO:
 # - Add some security checks (array sizes, memory alloc == NULL, etc)

diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/Types.pm b/source4/pidl/lib/Parse/Pidl/Samba3/Types.pm
index d1f1032714fb6bdeaee51dcc635c5f2c36ae9460..c31f406a380bac689417f38c7bf27a8636e13719 100644 (file)
--- a/source4/pidl/lib/Parse/Pidl/Samba3/Types.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba3/Types.pm
@@ -18,7 +18,7 @@ $VERSION = '0.01';
 
 # TODO: Find external types somehow?
 
-sub warning($$) { my ($e,$s) = @_; print STDERR "$e->{FILE}:$e->{LINE}: $s\n"; }
+sub warning($$) { my ($e,$s) = @_; print STDERR "$e->{ORIGINAL}->{FILE}:$e->{ORIGINAL}->{LINE}: $s\n"; }
 
 sub init_scalar($$$$)
 {
@@ -144,6 +144,12 @@ my $known_types =
                INIT => \&init_scalar,
                DISSECT_P => \&dissect_scalar,
        },
+       int32 =>
+       {
+               DECL => "int32",
+               INIT => \&init_scalar,
+               DISSECT_P => \&dissect_scalar,
+       },
        string => 
        {
                DECL => \&decl_string,
@@ -228,7 +234,7 @@ sub DeclShort($)
        my $t = $known_types->{$e->{TYPE}};
 
        if (not $t) {
-               warning($e, "Can't declare unknown type $e->{TYPE}");
+               warning($e, "Can't declare unknown type `$e->{TYPE}'");
                return undef;
        }
 
@@ -262,7 +268,7 @@ sub DeclLong($)
        my $t = $known_types->{$e->{TYPE}};
 
        if (not $t) {
-               warning($e, "Can't declare unknown type $e->{TYPE}");
+               warning($e, "Can't declare unknown type `$e->{TYPE}'");
                return undef;
        }