upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-23 22:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

added macro state to prevent macro related bugs.

Browse Source 
Does NOT properly handle macros
This commit is contained in:
John W. C. McNabb 2007-06-27 16:59:51 +00:00
parent ffc9498cef
commit 34771e8164
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
utils/wml.pm
View File

@ -112,18 +112,32 @@ sub read_text
my $token = '';
my $state = 'SEEK';
my $name = '';
my $macro=0;
foreach my $char (@chars) {
if($state eq 'SEEK') {
next if $char =~ /\s/;
if($char eq '[') {
$state = 'ELEMENT';
$state = 'ELEMENT';
$token = '';
} elsif($char eq '{') {
$state = 'MACRO';
$token = '';
$macro++;
} else {
$state = 'NAME';
$token .= $char;
}
} elsif($state eq 'MACRO') {
if($char eq '{'){
$macro++;
}elsif($char eq '}'){
$macro--;
}
if(0 == $macro){
$state = 'SEEK';
$token = '';
}
} elsif($state eq 'NAME') {
if($char eq '=') {
$name = $token;
@ -178,7 +192,7 @@ sub read_text
$token .= $char;
}
} elsif($state eq 'CLOSE_ELEMENT') {
if($char eq ']') {
if($char eq ']') {
my $expected = $cur->{'name'};
$expected eq $token or confess "close element '$token' doesn't match current open element '$expected'";
pop @stack or confess "illegal close element '$token'";
@ -333,7 +347,7 @@ sub get_children
my @res = ();
foreach my $child (@{$doc->{'children'}}) {
if($child->{'name'} eq $name) {
if($child->{'name'} eq $name) {
push @res, $child;
}
}