GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-02-16 21:40:46 +01:00
Code Issues Projects Releases Wiki Activity

Minor clean-up

Browse Source
This commit is contained in:
Pragmatic Software 2022-01-31 09:12:11 -08:00
parent a5e5dd5533
commit 41359b0c84
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
applets/compiler_vm/guest/bin/guest-gdb
View File

@ -211,8 +211,7 @@ sub compare_locals($old, $new) {
foreach my $local (@$new) { foreach my $local (@$new) {
my ($ident, $value) = @$local; my ($ident, $value) = @$local;
$ht{$ident} //= ''; # set non-existing key to empty string if (!exists $ht{$ident} || $ht{$ident} ne $value) {
if ($ht{$ident} ne $value) {
push @modified, [$ident, $value]; push @modified, [$ident, $value];
} }
} }
@ -272,13 +271,13 @@ sub get_main_start_end($context) {
# this line isn't part of main() yet # this line isn't part of main() yet
next if $line < $start; next if $line < $start;
# blank out contents of string and char literals # blank out contents of string and char literals so we don't count
# any braces within
$code =~ s/(?:\"((?:\\\"|(?!\").)*)\")/'"' . ('-' x length $1) . '"'/ge; $code =~ s/(?:\"((?:\\\"|(?!\").)*)\")/'"' . ('-' x length $1) . '"'/ge;
$code =~ s/(?:\'((?:\\\'|(?!\').)*)\')/"'" . ('-' x length $1) . "'"/ge; $code =~ s/(?:\'((?:\\\'|(?!\').)*)\')/"'" . ('-' x length $1) . "'"/ge;
while ($code =~ /(.)/g) { my @chars = split //, $code;
my $char = $1; foreach my $char (@chars) {
if ($char eq '{') { if ($char eq '{') {
$braces++; $braces++;
} elsif ($char eq '}') { } elsif ($char eq '}') {
@ -441,17 +440,11 @@ sub handle_program_exit($context, $data) {
sub handle_program_signal($context, $data) { sub handle_program_signal($context, $data) {
my $locals = locals_to_string(get_locals($context)); my $locals = locals_to_string(get_locals($context));
my $text = "Program received signal $data->{'signal-name'}, $data->{'signal-meaning'} ";
if ($data->{frame}->{func} eq '??') {
$text .= "in ?? ";
} else {
$text .= "in $data->{frame}->{func} ";
}
my $args = args_to_string($data->{frame}->{args}); my $args = args_to_string($data->{frame}->{args});
$text .= "($args) "; my $text = "Program received signal $data->{'signal-name'}, $data->{'signal-meaning'} ";
$text .= "in $data->{frame}->{func} ($args) ";
my $line; my $line;
@ -475,11 +468,14 @@ sub handle_program_signal($context, $data) {
} }
} }
$text .= "called by $trace->{func} $trace->{args} at statement: $line "; $text .= "called by $trace->{func} $trace->{args} ";
$text .= "at statement: $line " if $line;
} }
if (length $locals) { if (length $locals) {
$text .= "<local variables: $locals>" $text .= "<local variables: $locals>"
} else {
$text =~ s/\s+$//;
} }
print_gdb_output($context, $text); print_gdb_output($context, $text);
@ -510,8 +506,6 @@ sub dispatch_gdbmi_output($context, $output) {
RESULT , \&handle_result_output, RESULT , \&handle_result_output,
); );
print STDERR "dispatch: ", Dumper($output), "\n" if $debug >= 3;
$dispatch{$output->{_type}}->($context, $output); $dispatch{$output->{_type}}->($context, $output);
} }

5
applets/compiler_vm/host/lib/Languages/_default.pm
View File

@ -87,9 +87,8 @@ sub preprocess_code {
my $state = NORMAL; my $state = NORMAL;
my $escaped = 0; my $escaped = 0;
while($self->{code} =~ m/(.)/gs) { my @chars = split //, $self->{code};
my $ch = $1; foreach my $ch (@chars) {
given ($ch) { given ($ch) {
when ('\\') { when ('\\') {
if($escaped == 0) { if($escaped == 0) {