Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-20 17:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

bench: use *.cc for C++

Browse Source 
Using *.c is simpler, but triggers annoying warnings with Clang++.

* etc/bench.pl.in: Please the dictator.
This commit is contained in:
Akim Demaille
2020-03-22 17:15:50 +01:00
parent 2ab4058de0
commit 19f45df02b
1 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
etc/bench.pl.in
View File

@@ -775,7 +775,31 @@ sub run ($)
################################################################## ##################################################################
=item C<compile ($base)> =item C<language ($base)>
The language to use depending on the %language specification in
C<$base.y>: C<c> or C<c++>.
=cut
sub language ($)
{
my ($base) = @_;
if ($gbench)
{
"c++";
}
else
{
my $language = `sed -ne '/%language "\\(.*\\)"/{s//\\1/;p;q;}' $base.y`;
chomp $language;
$language eq 'C++' ? "c++" : "c";
}
}
##################################################################
=item C<compiler ($base)>
The compiler to use depending on the %language specification in The compiler to use depending on the %language specification in
C<$base.y>. C<$base.y>.
@@ -785,16 +809,12 @@ C<$base.y>.
sub compiler ($) sub compiler ($)
{ {
my ($base) = @_; my ($base) = @_;
if ($gbench) my %compiler =
{ (
$cxx; 'c++' => $cxx,
} 'c' => $cc,
else );
{ $compiler{language ($base)};
my $language = `sed -ne '/%language "\\(.*\\)"/{s//\\1/;p;q;}' $base.y`;
chomp $language;
$language eq 'C++' ? $cxx : $cc;
}
} }
################################################################## ##################################################################
@@ -812,14 +832,20 @@ sub compile ($)
my $my_bison = `sed -ne '/[/][/] %bison "\\(.*\\)"/{s//\\1/;p;q;}' $base.y`; my $my_bison = `sed -ne '/[/][/] %bison "\\(.*\\)"/{s//\\1/;p;q;}' $base.y`;
chop $my_bison; chop $my_bison;
run ((length $my_bison ? $my_bison : $bison) . " $base.y -o $base.c"); my %ext =
(
'c++' => 'cc',
'c' => 'c',
);
my $ext = $ext{language ($base)};
run ((length $my_bison ? $my_bison : $bison) . " $base.y -o $base.$ext");
if ($gbench) if ($gbench)
{ {
run "$compiler -c -o $base.o $cflags $base.c"; run "$compiler -c -o $base.o $cflags $base.$ext";
} }
else else
{ {
run "$compiler -o $base $cflags $base.c"; run "$compiler -o $base $cflags $base.$ext";
} }
} }
@@ -920,14 +946,14 @@ EOF
push @obj, "$base.o"; push @obj, "$base.o";
} }
my $out = new IO::File ">main.c"; my $out = new IO::File ">main.cc";
print $out <<EOF; print $out <<EOF;
#include <benchmark/benchmark.h> #include <benchmark/benchmark.h>
BENCHMARK_MAIN(); BENCHMARK_MAIN();
EOF EOF
run "$compiler -o main $cflags main.c @obj -lbenchmark"; run "$compiler -o main $cflags main.cc @obj -lbenchmark";
run "./main | tee -a README.md"; run "./main | tee -a README.md";
} }