[Eliot-dev] eliot/dic dic_search.cpp grammar.cpp regexp.h

[eliot-dev]

CVSROOT:        /cvsroot/eliot
Module name:    eliot
Changes by:     Olivier Teulière <ipkiss>      08/07/28 18:37:10

Modified files:
        dic            : dic_search.cpp grammar.cpp regexp.h 

Log message:
        Fixed a off-by-one error.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/dic_search.cpp?cvsroot=eliot&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/grammar.cpp?cvsroot=eliot&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/regexp.h?cvsroot=eliot&r1=1.17&r2=1.18

Patches:
Index: dic_search.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/dic_search.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- dic_search.cpp      27 Jul 2008 15:28:51 -0000      1.8
+++ dic_search.cpp      28 Jul 2008 18:37:09 -0000      1.9
@@ -515,7 +515,7 @@
     memset(&iList, 0, sizeof(iList));
     // Prepare the space for 5 items
     iList.symbl.assign(5, 0);
-    iList.letters.assign(5, vector<bool>(DIC_LETTERS, false));
+    iList.letters.assign(5, vector<bool>(DIC_LETTERS + 1, false));
 
     iList.symbl[0] = RE_ALL_MATCH; // All letters
     iList.symbl[1] = RE_VOWL_MATCH; // Vowels

Index: grammar.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/grammar.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- grammar.cpp 27 Jul 2008 15:28:51 -0000      1.3
+++ grammar.cpp 28 Jul 2008 18:37:09 -0000      1.4
@@ -149,7 +149,7 @@
         // j is the index of the new list we create
         size_t j = iList.symbl.size();
         iList.symbl.push_back(RE_ALL_MATCH + j);
-        iList.letters.push_back(vector<bool>(DIC_LETTERS, false));
+        iList.letters.push_back(vector<bool>(DIC_LETTERS + 1, false));
         for (itLetter = letters.begin(); itLetter != letters.end(); ++itLetter)
         {
             bool contains = (choiceLetters.find(*itLetter) != string::npos);

Index: regexp.h
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/regexp.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- regexp.h    27 Jul 2008 15:28:51 -0000      1.17
+++ regexp.h    28 Jul 2008 18:37:10 -0000      1.18
@@ -138,7 +138,7 @@
     vector<char> symbl;
     /**
      * 0 or 1 if letter is present in the list.
-     * The inner vector should have a length of DIC_LETTERS (it is a bitmask)
+     * The inner vector should have a length of DIC_LETTERS+1 (it is a bitmask)
      */
     vector<vector<bool> > letters;
 };