svn commit: samba r14215 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3: .

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-11 23:00:14 +0000 (Sat, 11 Mar 2006)
New Revision: 14215

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14215

Log:
Improve warning/error messages.

Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Client.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Header.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Parser.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Types.pm


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Client.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Client.pm	2006-03-11 22:21:27 UTC (rev 14214)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Client.pm	2006-03-11 23:00:14 UTC (rev 14215)
@@ -19,8 +19,8 @@
 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($$$$)
 {

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Header.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Header.pm	2006-03-11 22:21:27 UTC (rev 14214)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Header.pm	2006-03-11 23:00:14 UTC (rev 14215)
@@ -19,8 +19,8 @@
 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($)
 {

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Parser.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Parser.pm	2006-03-11 22:21:27 UTC (rev 14214)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Parser.pm	2006-03-11 23:00:14 UTC (rev 14215)
@@ -22,7 +22,7 @@
 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)

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Types.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Types.pm	2006-03-11 22:21:27 UTC (rev 14214)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/Types.pm	2006-03-11 23:00:14 UTC (rev 14215)
@@ -18,7 +18,7 @@
 
 # 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 @@
 		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 @@
 	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 @@
 	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;
 	}