[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] eliot wxwin/printout.cc wxwin/mainframe.cc wxwi...
|
From: |
eliot-dev |
|
Subject: |
[Eliot-dev] eliot wxwin/printout.cc wxwin/mainframe.cc wxwi... |
|
Date: |
Sat, 04 Aug 2007 20:01:29 +0000 |
CVSROOT: /cvsroot/eliot
Module name: eliot
Changes by: Antoine Fraboulet <afrab> 07/08/04 20:01:28
Modified files:
wxwin : printout.cc mainframe.cc gfxresult.cc
gfxboard.cc ewx.h configdb.cc confdimdlg.cc
auxframes.h auxframes.cc Makefile.am
utils : game_io.cpp eliottxt.cpp
game : round.cpp history.cpp game.h game.cpp
board_search.cpp board.cpp
dic : regexpmain.c listdic.c dic_search.c
dic_internals.h dic.c compdic.c automaton.c
alist.c
. : configure.in INSTALL .cvsignore
Log message:
- 32/64 bits types
- unused function parameters
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/printout.cc?cvsroot=eliot&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/mainframe.cc?cvsroot=eliot&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/gfxresult.cc?cvsroot=eliot&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/gfxboard.cc?cvsroot=eliot&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/ewx.h?cvsroot=eliot&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/configdb.cc?cvsroot=eliot&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/confdimdlg.cc?cvsroot=eliot&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/auxframes.h?cvsroot=eliot&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/auxframes.cc?cvsroot=eliot&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/Makefile.am?cvsroot=eliot&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/eliot/utils/game_io.cpp?cvsroot=eliot&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/eliot/utils/eliottxt.cpp?cvsroot=eliot&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/eliot/game/round.cpp?cvsroot=eliot&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/eliot/game/history.cpp?cvsroot=eliot&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/eliot/game/game.h?cvsroot=eliot&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/eliot/game/game.cpp?cvsroot=eliot&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/eliot/game/board_search.cpp?cvsroot=eliot&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/eliot/game/board.cpp?cvsroot=eliot&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/regexpmain.c?cvsroot=eliot&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/listdic.c?cvsroot=eliot&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/dic_search.c?cvsroot=eliot&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/dic_internals.h?cvsroot=eliot&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/dic.c?cvsroot=eliot&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/compdic.c?cvsroot=eliot&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/automaton.c?cvsroot=eliot&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/alist.c?cvsroot=eliot&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/eliot/configure.in?cvsroot=eliot&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/eliot/INSTALL?cvsroot=eliot&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/eliot/.cvsignore?cvsroot=eliot&r1=1.3&r2=1.4
Patches:
Index: wxwin/printout.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/printout.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- wxwin/printout.cc 26 Dec 2005 22:59:57 -0000 1.10
+++ wxwin/printout.cc 4 Aug 2007 20:01:27 -0000 1.11
@@ -112,7 +112,7 @@
}
void
-GamePrintout::DrawHeadingLine(wxDC *dc, long heightH, float mmToLogical)
+GamePrintout::DrawHeadingLine(wxDC *dc, long __UNUSED__ heightH, float
mmToLogical)
{
long i,x,w,y;
wxString str;
Index: wxwin/mainframe.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/mainframe.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- wxwin/mainframe.cc 8 Oct 2006 12:39:13 -0000 1.21
+++ wxwin/mainframe.cc 4 Aug 2007 20:01:27 -0000 1.22
@@ -153,10 +153,9 @@
//
// ******************************
-MainFrame::MainFrame(wxPoint pos_, wxSize size_)
- : wxFrame((wxFrame *) NULL, -1, wxT(APPNAME), wxPoint(-1, -1),
- size_, wxDEFAULT_FRAME_STYLE, wxT(APPNAME)),
- m_dic(NULL), m_game(NULL)
+MainFrame::MainFrame(wxPoint __UNUSED__ pos_, wxSize size_) :
+ wxFrame((wxFrame *) NULL, -1, wxT(APPNAME), wxPoint(-1, -1),
+ size_, wxDEFAULT_FRAME_STYLE, wxT(APPNAME)), m_dic(NULL),
m_game(NULL)
{
#if defined(ENABLE_RESLIST_IN_MAIN)
reslist = NULL;
Index: wxwin/gfxresult.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/gfxresult.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- wxwin/gfxresult.cc 15 Oct 2006 10:39:11 -0000 1.6
+++ wxwin/gfxresult.cc 4 Aug 2007 20:01:27 -0000 1.7
@@ -217,7 +217,7 @@
/* ************************************************** */
void
-GfxResult::OnSize(wxSizeEvent& e)
+GfxResult::OnSize(wxSizeEvent __UNUSED__ &e)
{
int w,h;
GetClientSize(&w,&h);
Index: wxwin/gfxboard.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/gfxboard.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- wxwin/gfxboard.cc 1 Jan 2006 19:34:05 -0000 1.9
+++ wxwin/gfxboard.cc 4 Aug 2007 20:01:27 -0000 1.10
@@ -92,7 +92,7 @@
*/
void
-GfxBoard::OnSize(wxSizeEvent& e)
+GfxBoard::OnSize(wxSizeEvent __UNUSED__ &e)
{
GFXDEBUG(std::cerr << "On size : ");
Index: wxwin/ewx.h
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/ewx.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- wxwin/ewx.h 1 Jan 2006 19:34:05 -0000 1.10
+++ wxwin/ewx.h 4 Aug 2007 20:01:27 -0000 1.11
@@ -42,6 +42,8 @@
# define TODO(x...)
#endif
+#define __UNUSED__ __attribute__((unused))
+
#if defined(__WIN32__) || defined(__WIN95__) || defined(__WXMSW__)
# define ENABLE_LC_NO_HEADER
# define ENABLE_RESLIST_IN_MAIN
Index: wxwin/configdb.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/configdb.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- wxwin/configdb.cc 26 Dec 2005 15:02:26 -0000 1.7
+++ wxwin/configdb.cc 4 Aug 2007 20:01:27 -0000 1.8
@@ -627,7 +627,7 @@
return 0.2;
}
-void ConfigDB::setPrintLineScale(float s)
+void ConfigDB::setPrintLineScale(float)
{
}
Index: wxwin/confdimdlg.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/confdimdlg.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- wxwin/confdimdlg.cc 5 Nov 2005 17:33:06 -0000 1.8
+++ wxwin/confdimdlg.cc 4 Aug 2007 20:01:27 -0000 1.9
@@ -412,7 +412,7 @@
}
void
-ConfDimDlg::OnCloseWindow(wxCloseEvent& event)
+ConfDimDlg::OnCloseWindow(wxCloseEvent __UNUSED__ &event)
{
if (IsModal() == TRUE)
EndModal(1);
@@ -421,7 +421,7 @@
}
void
-ConfDimDlg::OnButtonOk(wxCommandEvent& event)
+ConfDimDlg::OnButtonOk(wxCommandEvent __UNUSED__ &event)
{
writeconf();
if (IsModal() == TRUE)
@@ -431,7 +431,7 @@
}
void
-ConfDimDlg::OnButtonCancel(wxCommandEvent &event)
+ConfDimDlg::OnButtonCancel(wxCommandEvent __UNUSED__ &event)
{
if (IsModal() == TRUE)
EndModal(1);
@@ -440,13 +440,13 @@
}
void
-ConfDimDlg::OnButtonSave(wxCommandEvent& event)
+ConfDimDlg::OnButtonSave(wxCommandEvent __UNUSED__ &event)
{
writeconf();
}
void
-ConfDimDlg::OnConfPage(wxCommandEvent& event)
+ConfDimDlg::OnConfPage(wxCommandEvent __UNUSED__ &event)
{
//#if defined(__WXGTK__)
pagesetupdata = printdata;
@@ -462,7 +462,7 @@
}
void
-ConfDimDlg::OnConfPrinter(wxCommandEvent& event)
+ConfDimDlg::OnConfPrinter(wxCommandEvent __UNUSED__ &event)
{
//#if defined(__WXGTK__)
wxPrintDialogData printDialogData(printdata);
@@ -479,13 +479,13 @@
}
void
-ConfDimDlg::OnConfFontHead(wxCommandEvent& event)
+ConfDimDlg::OnConfFontHead(wxCommandEvent __UNUSED__ &event)
{
headfont = config.ChooseFont((wxFrame*)this,headfont);
}
void
-ConfDimDlg::OnConfFontText(wxCommandEvent& event)
+ConfDimDlg::OnConfFontText(wxCommandEvent __UNUSED__ &event)
{
textfont = config.ChooseFont((wxFrame*)this,textfont);
}
Index: wxwin/auxframes.h
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/auxframes.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- wxwin/auxframes.h 22 Jan 2006 12:23:53 -0000 1.7
+++ wxwin/auxframes.h 4 Aug 2007 20:01:27 -0000 1.8
@@ -88,7 +88,7 @@
void SwitchDisplay();
void Reload();
- virtual void Refresh(refresh_t force = REFRESH) {};
+ virtual void Refresh(refresh_t __UNUSED__ force = REFRESH) {};
};
/**
Index: wxwin/auxframes.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/auxframes.cc,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- wxwin/auxframes.cc 11 Aug 2006 22:18:33 -0000 1.22
+++ wxwin/auxframes.cc 4 Aug 2007 20:01:27 -0000 1.23
@@ -167,7 +167,7 @@
}
void
-BagFrame::Refresh(refresh_t force)
+BagFrame::Refresh(refresh_t __UNUSED__ force)
{
//debug(" BagFrame::Refresh\n");
int n,index;
@@ -210,7 +210,7 @@
}
void
-SearchFrame::Refresh(refresh_t force)
+SearchFrame::Refresh(refresh_t __UNUSED__ force)
{
//debug(" SearchFrame::Refresh\n");
}
@@ -269,7 +269,7 @@
}
void
-VerifFrame::Refresh(refresh_t force)
+VerifFrame::Refresh(refresh_t __UNUSED__ force)
{
//debug(" VerifFrame::Refresh\n");
}
@@ -313,7 +313,7 @@
}
void
-AuxFrameList::OnCopy(wxCommandEvent& event)
+AuxFrameList::OnCopy(wxCommandEvent __UNUSED__ &event)
{
wxString textdata;
@@ -338,7 +338,7 @@
}
void
-AuxFrameList::Refresh(refresh_t force)
+AuxFrameList::Refresh(refresh_t __UNUSED__ force)
{
//debug(" %s : Refresh start\n",(const char*)name.mb_str());
if (game == NULL)
@@ -518,7 +518,7 @@
}
void
-GameFrame::Refresh(refresh_t force)
+GameFrame::Refresh(refresh_t __UNUSED__ force)
{
std::ostringstream mos;
m_game.save(mos);
@@ -591,7 +591,7 @@
}
void
-ResultFrame::OnSize(wxSizeEvent& e)
+ResultFrame::OnSize(wxSizeEvent __UNUSED__ &e)
{
int w,h;
GetClientSize(&w,&h);
Index: wxwin/Makefile.am
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- wxwin/Makefile.am 11 Aug 2006 22:16:01 -0000 1.9
+++ wxwin/Makefile.am 4 Aug 2007 20:01:27 -0000 1.10
@@ -22,7 +22,7 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dic -I$(top_srcdir)/game
-AM_CPPFLAGS = @WX_CPPFLAGS@
+AM_CPPFLAGS = @WX_CPPFLAGS@ ## -Wno-strict-aliasing
eliot_SOURCES = \
configdb.cc configdb.h \
@@ -36,6 +36,7 @@
mainframe.cc mainframe.h \
main.cc ewx.h
+## eliot_CPPFLAGS=
eliot_LDADD = @WX_LIBS@ ../dic/libdic.a ../game/libgame.a
EXTRA_DIST = \
Index: utils/game_io.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/utils/game_io.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- utils/game_io.cpp 5 Nov 2006 13:27:49 -0000 1.10
+++ utils/game_io.cpp 4 Aug 2007 20:01:27 -0000 1.11
@@ -30,6 +30,7 @@
using namespace std;
+#define __UNUSED__ __attribute__((unused))
void GameIO::printBoard(ostream &out, const Game &iGame)
{
@@ -190,7 +191,7 @@
}
-void GameIO::printPlayedRack(ostream &out, const Game &iGame, int n)
+void GameIO::printPlayedRack(ostream &out, const Game &iGame, int __UNUSED__ n)
{
out <<
convertToMb(iGame.getCurrentPlayer().getCurrentRack().toString(PlayedRack::RACK_SIMPLE))
<< endl;
}
Index: utils/eliottxt.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/utils/eliottxt.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- utils/eliottxt.cpp 5 Nov 2006 13:27:49 -0000 1.17
+++ utils/eliottxt.cpp 4 Aug 2007 20:01:27 -0000 1.18
@@ -749,7 +749,7 @@
}
}
-void eliot_regexp(const Dictionary& iDic, wchar_t *cmd,
+void eliot_regexp(const Dictionary& iDic, wchar_t __attribute__((unused)) *cmd,
const wchar_t *delim, wchar_t **state)
{
/*
Index: game/round.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/game/round.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- game/round.cpp 5 Nov 2006 13:31:49 -0000 1.11
+++ game/round.cpp 4 Aug 2007 20:01:28 -0000 1.12
@@ -29,6 +29,8 @@
#define FROMRACK 0x2
#define JOKER 0x4
+#define __UNUSED__ __attribute__((unused))
+
Round::Round()
{
@@ -116,7 +118,7 @@
}
-void Round::removeRightToBoard(Tile c)
+void Round::removeRightToBoard(Tile __UNUSED__ c)
{
// c is unused.
m_word.pop_back();
@@ -136,7 +138,7 @@
}
-void Round::removeRightToRack(Tile c, bool iJoker)
+void Round::removeRightToRack(Tile __UNUSED__ c, bool __UNUSED__ iJoker)
{
// c is unused.
m_word.pop_back();
Index: game/history.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/game/history.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- game/history.cpp 22 Jan 2006 12:23:53 -0000 1.10
+++ game/history.cpp 4 Aug 2007 20:01:28 -0000 1.11
@@ -88,7 +88,8 @@
const Turn& History::getTurn(unsigned int n) const
{
- ASSERT(0 <= n && n < m_history.size(), "Wrong turn number");
+ // ASSERT(0 <= n && n < m_history.size(), "Wrong turn number");
+ ASSERT(n < m_history.size(), "Wrong turn number");
return *(m_history[n]);
}
Index: game/game.h
===================================================================
RCS file: /cvsroot/eliot/eliot/game/game.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- game/game.h 23 Dec 2006 16:48:15 -0000 1.30
+++ game/game.h 4 Aug 2007 20:01:28 -0000 1.31
@@ -46,6 +46,11 @@
class Game
{
public:
+ /// Game specs.
+ static const int RACK_SIZE;
+ static const int BONUS_POINTS;
+
+
Game(const Dictionary &iDic);
virtual ~Game();
@@ -136,7 +141,6 @@
* 2 : the rack check was set on and failed
* 3 : the rack cannot be completed (Game_*_setrackrandom only)
*************************/
- static const int RACK_SIZE;
enum set_rack_mode {RACK_ALL, RACK_NEW, RACK_MANUAL};
int setRack(int player, set_rack_mode mode, bool check, const wstring&
str);
Index: game/game.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/game/game.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- game/game.cpp 23 Dec 2006 13:50:43 -0000 1.32
+++ game/game.cpp 4 Aug 2007 20:01:28 -0000 1.33
@@ -36,7 +36,7 @@
const int Game::RACK_SIZE = 7;
-
+const int Game::BONUS_POINTS = 50;
Game::Game(const Dictionary &iDic):
m_dic(&iDic)
Index: game/board_search.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/game/board_search.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- game/board_search.cpp 5 Nov 2006 17:04:39 -0000 1.13
+++ game/board_search.cpp 4 Aug 2007 20:01:28 -0000 1.14
@@ -26,6 +26,7 @@
#include "board.h"
#include "encoding.h"
#include "debug.h"
+#include "game.h"
/*
* computes the score of a word, coordinates may be changed to reflect
@@ -74,8 +75,9 @@
fromrack++;
}
}
- pts = ptscross + pts * wordmul + 50 * (fromrack == 7);
- iWord.setBonus(fromrack == 7);
+
+ pts = ptscross + pts * wordmul + Game::BONUS_POINTS * (fromrack ==
Game::RACK_SIZE);
+ iWord.setBonus(fromrack == Game::RACK_SIZE);
iWord.setPoints(pts);
if (iWord.getCoord().getDir() == Coord::VERTICAL)
@@ -89,8 +91,6 @@
// Restore the coordinates
iWord.accessCoord().swap();
}
-
- /* fprintf(stdout,"eval: %s\n",convertToMb(iWord.toString()).c_str()); */
}
Index: game/board.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/game/board.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- game/board.cpp 23 Dec 2006 13:50:43 -0000 1.16
+++ game/board.cpp 4 Aug 2007 20:01:28 -0000 1.17
@@ -27,6 +27,7 @@
#include "results.h"
#include "board.h"
#include "debug.h"
+#include "game.h"
#define oo 0
#define __ 1
@@ -345,9 +346,9 @@
}
/* Set the iPointsMx and bonus */
- pts = ptscross + pts * wordmul + 50 * (fromrack == 7);
+ pts = ptscross + pts * wordmul + Game::BONUS_POINTS * (fromrack ==
Game::RACK_SIZE);
iRound.setPoints(pts);
- iRound.setBonus(fromrack == 7);
+ iRound.setBonus(fromrack == Game::RACK_SIZE);
return 0;
}
@@ -465,6 +466,7 @@
}
+// #define CELL_STRING_FORMAT "[%c:%s:%2d]"
#define CELL_STRING_FORMAT "[%s:%2d]"
string Board::getCellContent_row(int row, int col) const
Index: dic/regexpmain.c
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/regexpmain.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- dic/regexpmain.c 22 Jan 2006 12:23:53 -0000 1.12
+++ dic/regexpmain.c 4 Aug 2007 20:01:28 -0000 1.13
@@ -33,6 +33,8 @@
#include "regexp.h"
#include "dic_search.h"
+#define __UNUSED__ __attribute__((unused))
+
/********************************************************/
/********************************************************/
/********************************************************/
@@ -85,7 +87,7 @@
/********************************************************/
/********************************************************/
void
-usage(int argc, char* argv[])
+usage(int __UNUSED__ argc, char* argv[])
{
fprintf(stderr,"usage: %s dictionary\n",argv[0]);
fprintf(stderr," dictionary : path to dawg eliot dictionary\n");
Index: dic/listdic.c
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/listdic.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- dic/listdic.c 16 Apr 2006 11:27:19 -0000 1.9
+++ dic/listdic.c 4 Aug 2007 20:01:28 -0000 1.10
@@ -102,20 +102,20 @@
Dic_check_header(&header,filename);
-#define OO(IDENT) offsetof(Dict_header,IDENT)
+#define OO(IDENT) (unsigned long)offsetof(Dict_header,IDENT)
printf("Dictionary header information\n");
- printf("0x%02x ident : %s\n", OO(ident) ,header.ident);
- printf("0x%02x unused 1 : %6d %06x\n",OO(unused_1) ,header.unused_1
,header.unused_1);
- printf("0x%02x unused 2 : %6d %06x\n",OO(unused_2) ,header.unused_2
,header.unused_2);
- printf("0x%02x root : %6d %06x\n",OO(root) ,header.root
,header.root);
- printf("0x%02x words : %6d %06x\n",OO(nwords) ,header.nwords
,header.nwords);
- printf("0x%02x edges used : %6d %06x\n",OO(edgesused) ,header.edgesused
,header.edgesused);
- printf("0x%02x nodes used : %6d %06x\n",OO(nodesused) ,header.nodesused
,header.nodesused);
- printf("0x%02x nodes saved : %6d
%06x\n",OO(nodessaved),header.nodessaved,header.nodessaved);
- printf("0x%02x edges saved : %6d
%06x\n",OO(edgessaved),header.edgessaved,header.edgessaved);
+ printf("0x%02lx ident : %s\n", OO(ident) ,header.ident);
+ printf("0x%02lx unused 1 : %6d %06x\n",OO(unused_1) ,header.unused_1
,header.unused_1);
+ printf("0x%02lx unused 2 : %6d %06x\n",OO(unused_2) ,header.unused_2
,header.unused_2);
+ printf("0x%02lx root : %6d %06x\n",OO(root) ,header.root
,header.root);
+ printf("0x%02lx words : %6d %06x\n",OO(nwords) ,header.nwords
,header.nwords);
+ printf("0x%02lx edges used : %6d %06x\n",OO(edgesused) ,header.edgesused
,header.edgesused);
+ printf("0x%02lx nodes used : %6d %06x\n",OO(nodesused) ,header.nodesused
,header.nodesused);
+ printf("0x%02lx nodes saved : %6d
%06x\n",OO(nodessaved),header.nodessaved,header.nodessaved);
+ printf("0x%02lx edges saved : %6d
%06x\n",OO(edgessaved),header.edgessaved,header.edgessaved);
printf("\n");
- printf("sizeof(header) = 0x%x (%u)\n", sizeof(header), sizeof(header));
+ printf("sizeof(header) = 0x%lx (%lu)\n", (unsigned long)sizeof(header),
(unsigned long)sizeof(header));
}
@@ -129,8 +129,8 @@
ee.e = dic->dawg[i];
- printf("0x%04x %08x |%4d ptr=%8d t=%d l=%d f=%d chr=%2d (%c)\n",
- i*sizeof(ee), (unsigned int)(ee.s),
+ printf("0x%04lx %08x |%4d ptr=%8d t=%d l=%d f=%d chr=%2d (%c)\n",
+ (unsigned long)i*sizeof(ee), (unsigned int)(ee.s),
i, ee.e.ptr, ee.e.term, ee.e.last, ee.e.fill, ee.e.chr, ee.e.chr +'a'
-1);
}
Index: dic/dic_search.c
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/dic_search.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- dic/dic_search.c 14 Oct 2006 10:19:12 -0000 1.20
+++ dic/dic_search.c 4 Aug 2007 20:01:28 -0000 1.21
@@ -33,18 +33,16 @@
#include "dic.h"
#include "regexp.h"
#include "dic_search.h"
-#include "libdic_a-er.h" /* generated by bison */
-#include "scanner.h" /* generated by flex */
+#include "libdic_a-ery.h" /* generated by bison */
+#include "libdic_a-erl.h" /* generated by flex */
#include "automaton.h"
-/*
- * shut down the compiler
+/**
+ * function prototype for bison generated parser
*/
-static int yy_init_globals (yyscan_t yyscanner )
-{
- yy_init_globals(yyscanner);
- return 0;
-}
+int regexpparse(yyscan_t scanner, NODE** root,
+ struct search_RegE_list_t *list,
+ struct regexp_error_report_t *err);
/**
* Dic_seel_edgeptr
@@ -585,13 +583,6 @@
}
- /**
- * function prototype for parser generated by bison
- */
-int regexpparse(yyscan_t scanner, NODE** root,
- struct search_RegE_list_t *list,
- struct regexp_error_report_t *err);
-
void
Dic_search_RegE_inner(const Dictionary dic, const char* re,
char wordlist[RES_REGE_MAX][DIC_WORD_MAX],
@@ -680,7 +671,7 @@
wchar_t wordlist[RES_REGE_MAX][DIC_WORD_MAX],
struct search_RegE_list_t *list)
{
- int i, j;
+ int i;
char tmp_buff[RES_REGE_MAX][DIC_WORD_MAX];
char *tmp_re = malloc(wcslen(re) + 1);
sprintf(tmp_re, "%ls", re);
Index: dic/dic_internals.h
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/dic_internals.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- dic/dic_internals.h 16 Apr 2006 11:27:19 -0000 1.7
+++ dic/dic_internals.h 4 Aug 2007 20:01:28 -0000 1.8
@@ -87,12 +87,12 @@
char ident[sizeof(_COMPIL_KEYWORD_)];
char unused_1;
char unused_2;
- int root;
- int nwords;
- unsigned int edgesused;
- unsigned int nodesused;
- unsigned int nodessaved;
- unsigned int edgessaved;
+ int32_t root;
+ int32_t nwords;
+ uint32_t edgesused;
+ uint32_t nodesused;
+ uint32_t nodessaved;
+ uint32_t edgessaved;
};
Index: dic/dic.c
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/dic.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- dic/dic.c 16 Apr 2006 11:27:19 -0000 1.11
+++ dic/dic.c 4 Aug 2007 20:01:28 -0000 1.12
@@ -34,6 +34,8 @@
#include "dic_internals.h"
#include "dic.h"
+#define __UNUSED__ __attribute__((unused))
+
#if defined(WORDS_BIGENDIAN)
static uint32_t swap4(uint32_t v)
{
@@ -87,7 +89,7 @@
}
static void
-Dic_convert_data_to_arch(Dictionary dic)
+Dic_convert_data_to_arch(Dictionary __UNUSED__ dic)
{
#if defined(WORDS_BIGENDIAN)
int i;
Index: dic/compdic.c
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/compdic.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- dic/compdic.c 16 Apr 2006 11:27:19 -0000 1.9
+++ dic/compdic.c 4 Aug 2007 20:01:28 -0000 1.10
@@ -119,14 +119,14 @@
print_header_info(Dict_header *header)
{
printf("============================\n");
- printf("keyword length %u bytes\n", strlen(_COMPIL_KEYWORD_));
- printf("keyword size %u bytes\n", sizeof(_COMPIL_KEYWORD_));
- printf("header size %u bytes\n", sizeof(Dict_header));
+ printf("keyword length %lu bytes\n", (unsigned
long)strlen(_COMPIL_KEYWORD_));
+ printf("keyword size %lu bytes\n", (unsigned
long)sizeof(_COMPIL_KEYWORD_));
+ printf("header size %lu bytes\n", (unsigned long)sizeof(Dict_header));
printf("\n");
printf("%d words\n",header->nwords);
printf("\n");
printf("root : %7d (edge)\n",header->root);
- printf("root : %7u (byte)\n",header->root * sizeof(Dawg_edge));
+ printf("root : %7lu (byte)\n",(unsigned long) header->root *
sizeof(Dawg_edge));
printf("\n");
printf("nodes : %d+%d\n",header->nodesused, header->nodessaved);
printf("edges : %d+%d\n",header->edgesused, header->edgessaved);
@@ -280,6 +280,7 @@
Dawg_edge rootnode = {0,0,0,0,0};
Dawg_edge specialnode = {0,0,0,0,0};
+ int size;
char* outfilename;
char outfilenamedefault[] = "dict.daw";
clock_t starttime, endtime;
@@ -290,13 +291,14 @@
exit(1);
}
- dicsize = file_length (argv[1]);
- if (dicsize < 0)
+ size = file_length (argv[1]);
+ if (size < 0)
{
fprintf(stderr,"Cannot stat uncompressed dictionary %s\n",argv[1]);
exit(1);
}
+ dicsize = size;
outfilename = (argc == 3) ? argv[2] : outfilenamedefault;
if ((global_outfile = fopen (outfilename,"wb")) == NULL)
Index: dic/automaton.c
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/automaton.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- dic/automaton.c 1 Jan 2006 19:51:00 -0000 1.12
+++ dic/automaton.c 4 Aug 2007 20:01:28 -0000 1.13
@@ -72,8 +72,6 @@
static void s_automaton_delete (Automaton a);
static alist s_automaton_id_create (int id);
-static char* s_automaton_id_to_str (alist id);
-
static astate s_automaton_state_create (alist id);
static void s_automaton_add_state (Automaton a, astate s);
@@ -82,7 +80,9 @@
static Automaton s_automaton_PS_to_NFA (int init_state, int *ptl, int
*PS);
static Automaton s_automaton_NFA_to_DFA (Automaton a, struct
search_RegE_list_t *list);
static automaton s_automaton_finalize (Automaton a);
+
#ifdef DEBUG_AUTOMATON
+static char* s_automaton_id_to_str (alist id);
static void s_automaton_dump (Automaton a, char* filename);
#endif
@@ -114,8 +114,7 @@
exported functions for static automata
* ************************************************** */
-automaton
-automaton_build(int init_state, int *ptl, int *PS, struct search_RegE_list_t
*list)
+automaton automaton_build(int init_state, int *ptl, int *PS, struct
search_RegE_list_t *list)
{
Automaton nfa,dfa;
automaton final;
@@ -137,8 +136,7 @@
return final;
}
-void
-automaton_delete(automaton a)
+void automaton_delete(automaton a)
{
int i;
free(a->accept);
@@ -148,32 +146,27 @@
free(a);
}
-inline int
-automaton_get_nstates(automaton a)
+inline int automaton_get_nstates(automaton a)
{
return a->nstates;
}
-inline int
-automaton_get_init(automaton a)
+inline int automaton_get_init(automaton a)
{
return a->init;
}
-inline int
-automaton_get_accept(automaton a, int state)
+inline int automaton_get_accept(automaton a, int state)
{
return a->accept[state];
}
-inline int
-automaton_get_next_state(automaton a, int state, char l)
+inline int automaton_get_next_state(automaton a, int state, char l)
{
return a->trans[state][(int)l];
}
-void
-automaton_dump(automaton a, char* filename)
+void automaton_dump(automaton a, char* filename)
{
int i,l;
FILE* f;
@@ -223,16 +216,14 @@
* ************************************************** *
* ************************************************** */
-void
-state_delete_fun(void* ps)
+void state_delete_fun(void* ps)
{
astate s = ps;
alist_delete(s->id);
free(s);
}
-static Automaton
-s_automaton_create()
+static Automaton s_automaton_create()
{
Automaton a;
a = (Automaton)malloc(sizeof(struct Automaton_t));
@@ -244,37 +235,20 @@
}
-static void
-s_automaton_delete(Automaton a)
+static void s_automaton_delete(Automaton a)
{
alist_delete(a->states);
free(a);
}
-static alist
-s_automaton_id_create(int id)
+static alist s_automaton_id_create(int id)
{
alist a = alist_create();
- alist_add(a,(void*)id);
+ alist_add(a,(void*)((unsigned long)id));
return a;
}
-static char* s_automaton_id_to_str(alist id)
-{
- static char s[250];
- memset(s,0,sizeof(s));
- alist_elt ptr;
- for(ptr = alist_get_first(id); ptr ; ptr = alist_get_next(id,ptr))
- {
- char tmp[50];
- sprintf(tmp,"%d ",(int)alist_elt_get_value(ptr));
- strcat(s,tmp);
- }
- return s;
-}
-
-static astate
-s_automaton_state_create(alist id)
+static astate s_automaton_state_create(alist id)
{
astate s;
s = (astate)malloc(sizeof(struct automaton_state_t));
@@ -285,16 +259,14 @@
return s;
}
-static void
-s_automaton_add_state(Automaton a, astate s)
+static void s_automaton_add_state(Automaton a, astate s)
{
a->nstates ++;
alist_add(a->states,(void*)s);
DMSG(printf("** state %s added to
automaton\n",s_automaton_id_to_str(s->id)));
}
-static astate
-s_automaton_get_state(Automaton a, alist id)
+static astate s_automaton_get_state(Automaton a, alist id)
{
astate s;
alist_elt ptr;
@@ -314,8 +286,7 @@
* ************************************************** *
* ************************************************** */
-Automaton
-s_automaton_PS_to_NFA(int init_state_id, int *ptl, int *PS)
+Automaton s_automaton_PS_to_NFA(int init_state_id, int *ptl, int *PS)
{
int p;
int maxpos = PS[0];
@@ -352,7 +323,7 @@
for(pos = 1; pos <= maxpos; pos++)
{
if (ptl[pos] == current_letter &&
-
(int)alist_elt_get_value(alist_get_first(current_state->id)) & (1 << (pos - 1)))
+ (unsigned
long)alist_elt_get_value(alist_get_first(current_state->id)) & (1 << (pos - 1)))
ens |= PS[pos];
}
/* 5: transition from current_state to temp_state */
@@ -383,7 +354,7 @@
for(ptr = alist_get_first(nfa->states); ptr ; ptr =
alist_get_next(nfa->states,ptr))
{
astate s = (astate)alist_elt_get_value(ptr);
- if ((int)alist_elt_get_value(alist_get_first(s->id)) & (1 << (maxpos -
1)))
+ if ((unsigned long)alist_elt_get_value(alist_get_first(s->id)) & (1 <<
(maxpos - 1)))
s->accept = 1;
}
@@ -394,8 +365,7 @@
* ************************************************** *
* ************************************************** */
-static alist
-s_automaton_successor(alist S, int letter, Automaton nfa, struct
search_RegE_list_t *list)
+static alist s_automaton_successor(alist S, int letter, Automaton nfa, struct
search_RegE_list_t *list)
{
alist R,r;
alist_elt ptr;
@@ -406,7 +376,7 @@
int i;
alist t, Ry; astate y,z;
- i = (int)alist_elt_get_value(ptr);
+ i = (unsigned long)alist_elt_get_value(ptr);
t = s_automaton_id_create(i);
assert(y = s_automaton_get_state(nfa,t));
alist_delete(t);
@@ -461,8 +431,7 @@
return R;
}
-static void
-s_automaton_node_set_accept(astate s, Automaton nfa)
+static void s_automaton_node_set_accept(astate s, Automaton nfa)
{
void* idx;
alist_elt ptr;
@@ -482,8 +451,7 @@
DMSG(printf("\n"));
}
-static Automaton
-s_automaton_NFA_to_DFA(Automaton nfa, struct search_RegE_list_t *list)
+static Automaton s_automaton_NFA_to_DFA(Automaton nfa, struct
search_RegE_list_t *list)
{
Automaton dfa = NULL;
alist temp_id;
@@ -555,8 +523,7 @@
* ************************************************** *
* ************************************************** */
-static automaton
-s_automaton_finalize(Automaton a)
+static automaton s_automaton_finalize(Automaton a)
{
int i,l;
automaton fa = NULL;
@@ -609,8 +576,24 @@
* ************************************************** *
* ************************************************** */
-static void
-s_automaton_print_nodes(FILE* f, Automaton a)
+#ifdef DEBUG_AUTOMATON
+static char* s_automaton_id_to_str(alist id)
+{
+ static char s[250];
+ memset(s,0,sizeof(s));
+ alist_elt ptr;
+ for(ptr = alist_get_first(id); ptr ; ptr = alist_get_next(id,ptr))
+ {
+ char tmp[50];
+ sprintf(tmp,"%d ",(int)alist_elt_get_value(ptr));
+ strcat(s,tmp);
+ }
+ return s;
+}
+#endif // DEBUG_AUTOMATON
+
+#ifdef DEBUG_AUTOMATON
+static void s_automaton_print_nodes(FILE* f, Automaton a)
{
char * sid;
astate s;
@@ -632,9 +615,10 @@
}
fprintf(f,"\n");
}
+#endif // DEBUG_AUTOMATON
-static void
-s_automaton_print_edges(FILE* f, Automaton a)
+#ifdef DEBUG_AUTOMATON
+static void s_automaton_print_edges(FILE* f, Automaton a)
{
int letter;
char * sid;
@@ -657,9 +641,10 @@
}
}
}
+#endif // DEBUG_AUTOMATON
-static void
-s_automaton_dump(Automaton a, char* filename)
+#ifdef DEBUG_AUTOMATON
+static void s_automaton_dump(Automaton a, char* filename)
{
FILE* f;
#ifdef HAVE_SYS_WAIT_H
@@ -686,6 +671,7 @@
}
#endif
}
+#endif // DEBUG_AUTOMATON
/* ************************************************** *
* ************************************************** *
Index: dic/alist.c
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/alist.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- dic/alist.c 1 Jan 2006 19:51:00 -0000 1.4
+++ dic/alist.c 4 Aug 2007 20:01:28 -0000 1.5
@@ -27,6 +27,7 @@
#include <stdlib.h>
#include "alist.h"
+#define __UNUSED__ __attribute__((unused))
struct alist_elt_t {
void* info;
@@ -166,7 +167,7 @@
}
alist_elt
-alist_get_next(alist l, alist_elt e)
+alist_get_next(alist __UNUSED__ l, alist_elt e)
{
return e->next;
}
Index: configure.in
===================================================================
RCS file: /cvsroot/eliot/eliot/configure.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- configure.in 17 Sep 2006 15:20:50 -0000 1.19
+++ configure.in 4 Aug 2007 20:01:28 -0000 1.20
@@ -19,11 +19,12 @@
AC_PROG_RANLIB
AC_PROG_YACC
-if test "$YACC" = yacc; then
+if test "$YACC" = yacc ; then
AC_MSG_ERROR([Could not find the 'bison' program on your system])
fi
+
AM_PROG_LEX
-if test "$LEX" != flex; then
+if test "$LEX" != "flex" ; then
AC_MSG_ERROR([Could not find the 'flex' program on your system])
fi
@@ -34,26 +35,37 @@
AC_CACHE_CHECK([if \$CC accepts -Wall],
[ac_cv_c_Wall],
[CFLAGS="-Wall ${CFLAGS_save}"
- AC_TRY_COMPILE([],,ac_cv_c_Wall=yes, ac_cv_c_Wall=no)])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
[[]])],[ac_cv_c_Wall=yes],[ac_cv_c_Wall=no])])
CFLAGS="${CFLAGS_save}"
if test "${ac_cv_c_Wall}" != "no"; then
- CFLAGS="-Wall ${CFLAGS}"
- CXXFLAGS="-Wall ${CXXFLAGS}"
+ CFLAGS+=" -Wall"
+ CXXFLAGS+=" -Wall"
+fi
+
+CFLAGS_save="${CFLAGS}"
+AC_CACHE_CHECK([if \$CC accepts -Wextra],
+ [ac_cv_c_Wextra],
+ [CFLAGS="-Wextra ${CFLAGS_save}"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
[[]])],[ac_cv_c_Wextra=yes],[ac_cv_c_Wextra=no])])
+CFLAGS="${CFLAGS_save}"
+if test "${ac_cv_c_Wextra}" != "no"; then
+ CFLAGS+=" -Wextra"
+ CXXFLAGS+=" -Wextra"
fi
dnl Debug mode
AC_ARG_ENABLE([debug],AC_HELP_STRING([--enable-debug],[debug mode (default
disabled)]))
if test "${enable_debug}" = "yes"; then
- CFLAGS="${CFLAGS} -g -DDEBUG"
- CPPFLAGS="${CPPFLAGS} -g -DDEBUG"
+ CFLAGS+=" -g -DDEBUG"
+ CXXFLAGS+=" -g -DDEBUG"
fi
dnl Profile mode
AC_ARG_ENABLE([profile],AC_HELP_STRING([--enable-profile],[profile mode
(default disabled)]))
if test "${enable_profile}" = "yes"; then
- CFLAGS="${CFLAGS} -pg -DPROFILE"
- CPPFLAGS="${CPPFLAGS} -pg -DPROFILE"
- LDFLAGS="${LDFLAGS} -pg"
+ CFLAGS+=" -pg -DPROFILE"
+ CXXFLAGS+=" -pg -DPROFILE"
+ LDFLAGS+=" -pg"
fi
dnl Regexp / Listdic / Compdic build enable
Index: INSTALL
===================================================================
RCS file: /cvsroot/eliot/eliot/INSTALL,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- INSTALL 3 Apr 2005 21:12:03 -0000 1.8
+++ INSTALL 4 Aug 2007 20:01:28 -0000 1.9
@@ -4,18 +4,23 @@
./bootstrap
- ./configure --prefix=/usr/local/eliot
+ ./configure
make
make install
* Pour installer à partir de l'archive tar.gz
- ./configure --prefix=/usr/local/eliot
+ ./configure
make
make install
-Il suffit de rajouter le chemin pour trouver eliot
-sur sa ligne de commande et le tour est joué.
+
+il existe en fait 3 versions d'eliot, une en mode texte, une avec une
+interface curses et une avec wxwidgets. Les modes peuvent être
+sélectionnés à l'aide de la commande configure lors de la compilation
+du programme.
+
+./configure --enable-text --enable-ncurses --enable-wxwidgets
Index: .cvsignore
===================================================================
RCS file: /cvsroot/eliot/eliot/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- .cvsignore 9 Apr 2005 19:19:50 -0000 1.3
+++ .cvsignore 4 Aug 2007 20:01:28 -0000 1.4
@@ -1,34 +1,35 @@
.*
ABOUT-NLS
-intl
-m4
-core
-core.*
-gmon.out
-configure
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+compile
+config.cache
+config.guess
config.h
config.h.*
-config.guess
config.log
-config.cache
config.rpath
config.status
config.sub
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-compile
-depcomp
-install-sh
-missing
-mkinstalldirs
-stamp-*
+configure
+core
+core.*
cscope.files
cscope.out
+depcomp
dic/cscope.files
dic/cscope.out
game/cscope.files
game/cscope.out
+gmon.out
+install-sh
+intl
+m4
+missing
+mkinstalldirs
+stamp-*
wxwin/cscope.files
wxwin/cscope.out
+ylwrap
- [Eliot-dev] eliot wxwin/printout.cc wxwin/mainframe.cc wxwi...,
eliot-dev <=