GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-11-19 10:29:30 +01:00
Code Issues Projects Releases Wiki Activity

CGrammar: Return output instead of printing; improve error-handling of misparsed code

Browse Source
This commit is contained in:
Pragmatic Software 2014-06-22 06:08:01 +00:00
parent e9b3d7e255
commit d97f8b2fd6
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PBot/VERSION.pm
View File

@ -13,7 +13,7 @@ use warnings;
# These are set automatically by the build/commit script # These are set automatically by the build/commit script
use constant { use constant {
BUILD_NAME => "PBot", BUILD_NAME => "PBot",
BUILD_REVISION => 667, BUILD_REVISION => 668,
BUILD_DATE => "2014-06-21", BUILD_DATE => "2014-06-21",
}; };

3
modules/c2english/CGrammar.pm
View File

@ -17,9 +17,10 @@ startrule:
my $output = $item[-1]; my $output = $item[-1];
$output =~ s/\^L(\s*.?)/\L$1/g; # lowercase specified characters $output =~ s/\^L(\s*.?)/\L$1/g; # lowercase specified characters
$output =~ s/\^U(\s*.?)/\U$1/g; # uppercase specified characters $output =~ s/\^U(\s*.?)/\U$1/g; # uppercase specified characters
print $output; push @$return, $output;
} }
startrule(?) startrule(?)
{ push @$return, $item[-1]; }
translation_unit: translation_unit:
comment comment

13
modules/c2english/c2eng.pl
View File

@ -61,11 +61,18 @@ foreach my $arg (@ARGV) {
undef $::RD_TRACE; undef $::RD_TRACE;
} }
defined $parser->startrule(\$text) or die "Bad text!\n$text\n"; my $result = $parser->startrule(\$text) or die "Bad text!\n$text\n";
$text =~ s/^\s+//g;
$text =~ s/\s+$//g;
if(length $text) {
die "Bad parse: $text";
} else {
print join('', flatten($result));
}
} }
$text =~ s/\s+//g;
print "\n[$text]\n" if length $text;
sub precompile_grammar { sub precompile_grammar {
print STDERR "Precompiling grammar...\n"; print STDERR "Precompiling grammar...\n";