Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2025-01-30 20:34:27 +01:00
Code Issues Projects Releases Packages Wiki Activity

Oops... I forgot to update this file when simplifying the prototype of Dictionary::searchRegExp()

Browse source
This commit is contained in:
Olivier Teulière 2008-07-28 19:57:46 +00:00
parent cad582d912
commit 89cd23d4b7
1 changed files with 4 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
wxwin/searchpanel.cc
View file

@ -29,7 +29,6 @@
#include "ewx.h" #include "ewx.h"
#include "dic.h" #include "dic.h"
#include "regexp.h"
#include "searchpanel.h" #include "searchpanel.h"
#include "tile.h" #include "tile.h"
#include "configdb.h" #include "configdb.h"
@ -229,66 +228,17 @@ PPlus1::compute_enter(wxCommandEvent&)
class PRegExp : public SimpleSearchPanel class PRegExp : public SimpleSearchPanel
{ {
protected: private:
wxTextCtrl *omin; wxTextCtrl *omin;
wxTextCtrl *omax; wxTextCtrl *omax;
struct search_RegE_list_t llist;
virtual void build_letter_lists(); void panel_options();
virtual void panel_options();
public: public:
void compute_char(wxCommandEvent&) {} void compute_char(wxCommandEvent&) {}
void compute_enter(wxCommandEvent&); void compute_enter(wxCommandEvent&);
PRegExp(wxWindow* parent, int id, const Dictionary &d) : SimpleSearchPanel(parent,id,d) { panel_build(); } PRegExp(wxWindow* parent, int id, const Dictionary &d) : SimpleSearchPanel(parent,id,d) { panel_build(); }
}; };
void
PRegExp::build_letter_lists()
{
memset (&llist, 0, sizeof(llist));
llist.minlength = 1;
llist.maxlength = 15;
llist.symbl[0] = RE_ALL_MATCH;
llist.symbl[1] = RE_VOWL_MATCH;
llist.symbl[2] = RE_CONS_MATCH;
llist.symbl[3] = RE_USR1_MATCH;
llist.symbl[5] = RE_USR2_MATCH;
llist.valid[0] = 1; // all letters
llist.valid[1] = 1; // vowels
llist.valid[2] = 1; // consonants
llist.valid[3] = 0; // user defined list 1
llist.valid[4] = 0; // user defined list 2
for(int i = 0; i < DIC_SEARCH_REGE_LIST; i++)
{
memset(llist.letters[i],0,sizeof(llist.letters[i]));
}
const std::vector<Tile>& allTiles = dic->getAllTiles();
std::vector<Tile>::const_iterator it;
for (it = allTiles.begin(); it != allTiles.end(); it++)
{
if (! it->isJoker() && ! it->isEmpty())
{
// all tiles
llist.letters[0][it->toCode()] = 1;
// vowels
if (it->isVowel())
{
llist.letters[1][it->toCode()] = 1;
}
// consonants
if (it->isConsonant())
{
llist.letters[2][it->toCode()] = 1;
}
}
}
}
void void
PRegExp::panel_options() PRegExp::panel_options()
{ {
@ -317,8 +267,6 @@ PRegExp::compute_enter(wxCommandEvent&)
if (!check_dic()) if (!check_dic())
return; return;
build_letter_lists();
wstring regexp = t->GetValue().wc_str(); wstring regexp = t->GetValue().wc_str();
debug("PRegExp::compute_enter for %ls", regexp.c_str()); debug("PRegExp::compute_enter for %ls", regexp.c_str());
@ -326,8 +274,6 @@ PRegExp::compute_enter(wxCommandEvent&)
int lmax = atoi((const char*)omax->GetValue().mb_str()); int lmax = atoi((const char*)omax->GetValue().mb_str());
if (lmax <= (DIC_WORD_MAX - 1) && lmin >= 1 && lmin <= lmax) if (lmax <= (DIC_WORD_MAX - 1) && lmin >= 1 && lmin <= lmax)
{ {
llist.minlength = lmin;
llist.maxlength = lmax;
debug(" length %d,%d",lmin,lmax); debug(" length %d,%d",lmin,lmax);
} }
else else
@ -335,11 +281,12 @@ PRegExp::compute_enter(wxCommandEvent&)
debug(" bad length -%s,%s-", debug(" bad length -%s,%s-",
(const char*)omin->GetValue().mb_str(), (const char*)omin->GetValue().mb_str(),
(const char*)omax->GetValue().mb_str()); (const char*)omax->GetValue().mb_str());
return;
} }
debug("\n"); debug("\n");
vector<wstring> wordList; vector<wstring> wordList;
dic->searchRegExp(regexp, wordList, &llist); dic->searchRegExp(regexp, wordList, lmin, lmax);
wxString *res = new wxString[wordList.size()]; wxString *res = new wxString[wordList.size()];
int resnum = 0; int resnum = 0;