GitHub
/
pbot
mirror of https://github.com/pragma-/pbot.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

compiler_vm: fix C pretty-formatter

This commit is contained in:
Pragmatic Software 2019-06-22 18:28:11 -07:00
parent 5c8eab8a4c
commit 3305900497
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/compiler_vm/languages/_c_base.pm
View File

@ -86,7 +86,7 @@ sub pretty_format {
print $fh $code;
close $fh;
system("astyle", "-A3 -UHpnfq", $self->{sourcefile});
system("astyle", "-A3", "-UHpnfq", $self->{sourcefile});
open $fh, "<$self->{sourcefile}" or die "Couldn't read $self->{sourcefile}: $!";
$result = join '', <$fh>;
@ -124,13 +124,13 @@ sub preprocess_code {
} elsif($ch eq '#' and not $cpp and not $escaped and not $single_quote and not $double_quote) {
$cpp = 1;
if($self->{code} =~ m/include\s*<([^>\n]*)>/msg) {
if($self->{code} =~ m/include\s*<([^>\n]*)>(?!\n)/msg) {
my $match = $1;
$pos = pos $self->{code};
substr ($self->{code}, $pos, 0) = "\n";
pos $self->{code} = $pos;
$cpp = 0;
} elsif($self->{code} =~ m/include\s*"([^"\n]*)"/msg) {
} elsif($self->{code} =~ m/include\s*"([^"\n]*)"(?!\n)/msg) {
my $match = $1;
$pos = pos $self->{code};
substr ($self->{code}, $pos, 0) = "\n";