Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2024-12-27 09:58:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Header::print() now takes the output stream as parameter

Browse source
This commit is contained in:
Olivier Teulière 2012-11-29 19:43:08 +01:00
parent 6a70d28d28
commit f49e4bb759
4 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dic/compdicmain.cpp
View file

@ -251,7 +251,7 @@ int main(int argc, char* argv[])
builder.generateDawg(inFileName, outFileName, dicName); builder.generateDawg(inFileName, outFileName, dicName);
// Print the header // Print the header
header.print(); header.print(cout);
cout << fmt(_(" Load time: %1% s")) % builder.getLoadTime() << endl; cout << fmt(_(" Load time: %1% s")) % builder.getLoadTime() << endl;
cout << fmt(_(" Compression time: %1% s")) % builder.getBuildTime() << endl; cout << fmt(_(" Compression time: %1% s")) % builder.getBuildTime() << endl;

36
dic/header.cpp
View file

@ -21,7 +21,7 @@
#include "config.h" #include "config.h"
#include <cstring> // for strcpy #include <cstring> // for strcpy
#include <cstdio> // for snprintf #include <cstdio> // for sprintf
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
@ -649,30 +649,30 @@ wstring Header::writeDisplayAndInput() const
} }
void Header::print() const void Header::print(ostream &out) const
{ {
#define fmt(x) boost::format(x) #define fmt(x) boost::format(x)
cout << fmt(_("Dictionary name: %1%")) % lfw(m_dicName) << endl; out << fmt(_("Dictionary name: %1%")) % lfw(m_dicName) << endl;
char buf[150]; char buf[150];
strftime(buf, sizeof(buf), "%c", gmtime(&m_compressDate)); strftime(buf, sizeof(buf), "%c", gmtime(&m_compressDate));
cout << fmt(_("Compressed on: %1%")) % buf << endl; out << fmt(_("Compressed on: %1%")) % buf << endl;
cout << fmt(_("Compressed using a binary compiled by: %1%")) % lfw(m_userHost) << endl; out << fmt(_("Compressed using a binary compiled by: %1%")) % lfw(m_userHost) << endl;
cout << fmt(_("Dictionary type: %1%")) % (m_type == kDAWG ? "DAWG" : "GADDAG") << endl; out << fmt(_("Dictionary type: %1%")) % (m_type == kDAWG ? "DAWG" : "GADDAG") << endl;
cout << fmt(_("Letters: %1%")) % lfw(m_letters) << endl; out << fmt(_("Letters: %1%")) % lfw(m_letters) << endl;
cout << fmt(_("Number of letters: %1%")) % m_letters.size() << endl; out << fmt(_("Number of letters: %1%")) % m_letters.size() << endl;
cout << fmt(_("Number of words: %1%")) % m_nbWords << endl; out << fmt(_("Number of words: %1%")) % m_nbWords << endl;
long unsigned int size = sizeof(Dict_header_old) + long unsigned int size = sizeof(Dict_header_old) +
sizeof(Dict_header_ext) + sizeof(Dict_header_ext_2); sizeof(Dict_header_ext) + sizeof(Dict_header_ext_2);
cout << fmt(_("Header size: %1% bytes")) % size << endl; out << fmt(_("Header size: %1% bytes")) % size << endl;
cout << fmt(_("Root: %1% (edge)")) % m_root << endl; out << fmt(_("Root: %1% (edge)")) % m_root << endl;
cout << fmt(_("Nodes: %1% used + %2% saved")) % m_nodesUsed % m_nodesSaved << endl; out << fmt(_("Nodes: %1% used + %2% saved")) % m_nodesUsed % m_nodesSaved << endl;
cout << fmt(_("Edges: %1% used + %2% saved")) % m_edgesUsed % m_edgesSaved << endl; out << fmt(_("Edges: %1% used + %2% saved")) % m_edgesUsed % m_edgesSaved << endl;
#undef fmt #undef fmt
cout << "====================================================================" << endl; out << "====================================================================" << endl;
cout << format("%1% | %2% | %3% | %4% | %5% | %6% | %7%") out << format("%1% | %2% | %3% | %4% | %5% | %6% | %7%")
% _("Letter") % _("Points") % _("Frequency") % _("Vowel") % _("Letter") % _("Points") % _("Frequency") % _("Vowel")
% _("Consonant") % _("Display") % _("Alt. input") << endl; % _("Consonant") % _("Display") % _("Alt. input") << endl;
cout << "-------+--------+-----------+-------+-----------+-------+------" << endl; out << "-------+--------+-----------+-------+-----------+-------+------" << endl;
#define sz(x) strlen(_(x)) #define sz(x) strlen(_(x))
for (unsigned int i = 0; i < m_letters.size(); ++i) for (unsigned int i = 0; i < m_letters.size(); ++i)
{ {
@ -704,9 +704,9 @@ void Header::print() const
{ {
fmter % string(sz("Display"), ' ') % string(sz("Alt. input"), ' '); fmter % string(sz("Display"), ' ') % string(sz("Alt. input"), ' ');
} }
cout << fmter.str() << endl; out << fmter.str() << endl;
} }
#undef sz #undef sz
cout << "====================================================================" << endl; out << "====================================================================" << endl;
} }

2
dic/header.h
View file

@ -153,7 +153,7 @@ public:
/** /**
* Print a readable summary of the header on standard output * Print a readable summary of the header on standard output
*/ */
void print() const; void print(ostream &out) const;
/** /**
* Write the header to a file, using the latest format * Write the header to a file, using the latest format

2
dic/listdicmain.cpp
View file

@ -54,7 +54,7 @@ using namespace std;
static void printHeader(const Dictionary &iDic) static void printHeader(const Dictionary &iDic)
{ {
iDic.getHeader().print(); iDic.getHeader().print(cout);
} }