Skip to content

Commit c3e96eb

Browse files
Matthias Güdemanntautschnig
Matthias Güdemann
authored and
tautschnig
committed
add centered git version to CBMC banner
1 parent 5e39b47 commit c3e96eb

File tree

12 files changed

+57
-63
lines changed

12 files changed

+57
-63
lines changed

‎jbmc/src/janalyzer/janalyzer_parse_options.cpp‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -721,17 +721,11 @@ bool janalyzer_parse_optionst::process_goto_program(const optionst &options)
721721
/// display command line help
722722
void janalyzer_parse_optionst::help()
723723
{
724-
std::cout << "\n"
725-
"* * JANALYZER " CBMC_VERSION " - Copyright (C) 2017-2018 ";
726-
727-
std::cout << "(" << (sizeof(void *) * 8) << "-bit version)";
728-
729-
std::cout << " * *\n";
730-
731724
// clang-format off
732-
std::cout <<
725+
std::cout << '\n' << banner_string("JANALYZER", CBMC_VERSION) << '\n'
726+
<<
733727
/* NOLINTNEXTLINE(whitespace/line_length) */
734-
"* * JANALYZER " CBMC_VERSION " - Copyright (C) 2016-2018 * *\n"
728+
"* * Copyright (C) 2016-2018 * *\n"
735729
"* * Daniel Kroening, Diffblue * *\n"
736730
"* * kroening@kroening.com * *\n"
737731
"\n"

‎jbmc/src/jbmc/jbmc_parse_options.cpp‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,15 +1067,10 @@ bool jbmc_parse_optionst::generate_function_body(
10671067
/// display command line help
10681068
void jbmc_parse_optionst::help()
10691069
{
1070-
std::cout << "\n"
1071-
"* * JBMC " CBMC_VERSION " - Copyright (C) 2001-2018 ";
1072-
1073-
std::cout << "(" << (sizeof(void *)*8) << "-bit version)";
1074-
1075-
std::cout << " * *\n";
1076-
10771070
// clang-format off
1078-
std::cout <<
1071+
std::cout << '\n' << banner_string("JBMC", CBMC_VERSION) << '\n'
1072+
<<
1073+
"* * Copyright (C) 2001-2018 * *\n"
10791074
"* * Daniel Kroening, Edmund Clarke * *\n"
10801075
"* * Carnegie Mellon University, Computer Science Department * *\n"
10811076
"* * kroening@kroening.com * *\n"

‎jbmc/src/jdiff/jdiff_parse_options.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -427,10 +427,9 @@ bool jdiff_parse_optionst::process_goto_program(
427427
void jdiff_parse_optionst::help()
428428
{
429429
// clang-format off
430-
std::cout <<
431-
"\n"
432-
// NOLINTNEXTLINE(whitespace/line_length)
433-
"* * JDIFF " CBMC_VERSION " - Copyright (C) 2016-2018 * *\n"
430+
std::cout << '\n' << banner_string("JDIFF", CBMC_VERSION) << '\n'
431+
<<
432+
"* * Copyright (C) 2016-2018 * *\n"
434433
"* * Daniel Kroening, Peter Schrammel * *\n"
435434
"* * kroening@kroening.com * *\n"
436435
"\n"

‎src/cbmc/cbmc_parse_options.cpp‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -866,15 +866,9 @@ bool cbmc_parse_optionst::process_goto_program(
866866
void cbmc_parse_optionst::help()
867867
{
868868
// clang-format off
869-
std::cout <<
870-
"\n"
871-
"* * CBMC " CBMC_VERSION " - Copyright (C) 2001-2018 ";
872-
873-
std::cout << "(" << (sizeof(void *)*8) << "-bit version)";
874-
875-
std::cout << " * *\n";
876-
877-
std::cout <<
869+
std::cout << '\n' << banner_string("CBMC", CBMC_VERSION) << '\n'
870+
<<
871+
"* * Copyright (C) 2001-2018 * *\n"
878872
"* * Daniel Kroening, Edmund Clarke * *\n"
879873
"* * Carnegie Mellon University, Computer Science Department * *\n"
880874
"* * kroening@kroening.com * *\n"

‎src/clobber/clobber_parse_options.cpp‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -348,15 +348,10 @@ void clobber_parse_optionst::report_failure()
348348
/// display command line help
349349
void clobber_parse_optionst::help()
350350
{
351-
std::cout <<
352-
"\n"
353-
"* * CLOBBER " CBMC_VERSION " - Copyright (C) 2014 ";
354-
355-
std::cout << "(" << (sizeof(void *)*8) << "-bit version)";
356-
357-
std::cout << " * *\n";
358-
359-
std::cout <<
351+
// clang-format off
352+
std::cout << '\n' << banner_string("CLOBBER", CBMC_VERSION) << '\n'
353+
<<
354+
"* * Copyright (C) 2014 * *\n"
360355
"* * Daniel Kroening * *\n"
361356
"* * University of Oxford * *\n"
362357
"* * kroening@kroening.com * *\n"
@@ -414,4 +409,5 @@ void clobber_parse_optionst::help()
414409
" --version show version and exit\n"
415410
" --xml-ui use XML-formatted output\n"
416411
"\n";
412+
// clang-format on
417413
}

‎src/goto-analyzer/goto_analyzer_parse_options.cpp‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -789,15 +789,10 @@ bool goto_analyzer_parse_optionst::process_goto_program(
789789
/// display command line help
790790
void goto_analyzer_parse_optionst::help()
791791
{
792-
std::cout << "\n"
793-
"* * GOTO-ANALYZER " CBMC_VERSION " - Copyright (C) 2017-2018 ";
794-
795-
std::cout << "(" << (sizeof(void *)*8) << "-bit version)";
796-
797-
std::cout << " * *\n";
798-
799792
// clang-format off
800-
std::cout <<
793+
std::cout << '\n' << banner_string("GOTO-ANALYZER", CBMC_VERSION) << '\n'
794+
<<
795+
"* * Copyright (C) 2017-2018 * *\n"
801796
"* * Daniel Kroening, DiffBlue * *\n"
802797
"* * kroening@kroening.com * *\n"
803798
"\n"

‎src/goto-cc/goto_cc_mode.cpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Author: CM Wintersteiger, 2006
2222
#include <sysexits.h>
2323
#endif
2424

25+
#include <util/parse_options.h>
2526

2627
/// constructor
2728
goto_cc_modet::goto_cc_modet(
@@ -43,10 +44,10 @@ goto_cc_modet::~goto_cc_modet()
4344
/// display command line help
4445
void goto_cc_modet::help()
4546
{
46-
std::cout <<
47-
"\n"
48-
// NOLINTNEXTLINE(whitespace/line_length)
49-
"* * goto-cc " CBMC_VERSION " - Copyright (C) 2006-2018 * *\n"
47+
// clang-format off
48+
std::cout << '\n' << banner_string("goto-cc", CBMC_VERSION) << '\n'
49+
<<
50+
"* * Copyright (C) 2006-2018 * *\n"
5051
"* * Daniel Kroening, Michael Tautschnig, * *\n"
5152
"* * Christoph Wintersteiger * *\n"
5253
"\n";
@@ -64,6 +65,7 @@ void goto_cc_modet::help()
6465
" --print-rejected-preprocessed-source file\n"
6566
" copy failing (preprocessed) source to file\n"
6667
"\n";
68+
// clang-format on
6769
}
6870

6971
/// starts the compiler

‎src/goto-diff/goto_diff_parse_options.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -484,10 +484,9 @@ bool goto_diff_parse_optionst::process_goto_program(
484484
void goto_diff_parse_optionst::help()
485485
{
486486
// clang-format off
487-
std::cout <<
488-
"\n"
489-
// NOLINTNEXTLINE(whitespace/line_length)
490-
"* * GOTO_DIFF " CBMC_VERSION " - Copyright (C) 2016 * *\n"
487+
std::cout << '\n' << banner_string("GOTO_DIFF", CBMC_VERSION) << '\n'
488+
<<
489+
"* * Copyright (C) 2016 * *\n"
491490
"* * Daniel Kroening, Peter Schrammel * *\n"
492491
"* * kroening@kroening.com * *\n"
493492
"\n"

‎src/goto-instrument/goto_instrument_parse_options.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,9 +1439,9 @@ void goto_instrument_parse_optionst::instrument_goto_program()
14391439
void goto_instrument_parse_optionst::help()
14401440
{
14411441
// clang-format off
1442-
std::cout <<
1443-
"\n"
1444-
"* * Goto-Instrument " CBMC_VERSION " - Copyright (C) 2008-2013 * *\n" // NOLINT(*)
1442+
std::cout << '\n' << banner_string("Goto-Instrument", CBMC_VERSION) << '\n'
1443+
<<
1444+
"* * Copyright (C) 2008-2013 * *\n"
14451445
"* * Daniel Kroening * *\n"
14461446
"* * kroening@kroening.com * *\n"
14471447
"\n"

‎src/memory-models/mmcc_parse_options.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,16 @@ int mmcc_parse_optionst::convert(
9595
/// display command line help
9696
void mmcc_parse_optionst::help()
9797
{
98-
std::cout <<
99-
"\n"
100-
"* * MMCC " CBMC_VERSION " - Copyright (C) 2015-2015 * *\n";
101-
102-
std::cout <<
98+
// clang-format off
99+
std::cout << '\n' << banner_string("MMCC", CBMC_VERSION) << '\n'
100+
<<
101+
" Copyright (C) 2015-2015\n"
103102
"\n"
104103
"Usage: Purpose:\n"
105104
"\n"
106105
" mmcc [-?] [-h] [--help] show help\n"
107106
" mmcc file.cat convert given source file\n"
108107
" mmcc convert from stdin\n"
109108
"\n";
109+
// clang-format on
110110
}

0 commit comments

Comments
 (0)