From 3305900497dc01e355ba95e0611f9d08976b01dd Mon Sep 17 00:00:00 2001
From: Pragmatic Software <pragma78@gmail.com>
Date: Sat, 22 Jun 2019 18:28:11 -0700
Subject: [PATCH] compiler_vm: fix C pretty-formatter

---
 modules/compiler_vm/languages/_c_base.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/compiler_vm/languages/_c_base.pm b/modules/compiler_vm/languages/_c_base.pm
index d823325e..b9738837 100755
--- a/modules/compiler_vm/languages/_c_base.pm
+++ b/modules/compiler_vm/languages/_c_base.pm
@@ -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";