Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Report XML parse errors better in validator tool

Browse Source 
This was SVN commit r9874.
This commit is contained in:
Ykkrosh 2011-07-18 14:57:41 +00:00
parent 65d87eaee7
commit ead45aa957
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/tools/entity/Entity.pm
View File

@ -31,7 +31,7 @@ sub trim
sub load_xml
{
my ($file) = @_;
my ($vfspath, $file) = @_;
my $root = {};
my @stack = ($root);
my $p = new XML::Parser(Handlers => {
@ -55,8 +55,12 @@ sub load_xml
$stack[-1]{' content'} .= $str;
},
});
$p->parse($file);
eval {
$p->parse($file);
};
if ($@) {
die "Error parsing $vfspath: $@";
}
return $root;
}
@ -95,7 +99,7 @@ sub apply_layer
sub load_inherited
{
my ($vfspath) = @_;
my $layer = load_xml(get_file($vfspath));
my $layer = load_xml($vfspath, get_file($vfspath));
if ($layer->{Entity}{'@parent'}) {
my $parent = load_inherited($layer->{Entity}{'@parent'}{' content'});