Changeset 12318

Timestamp:

2006-07-28T12:00:42+12:00 (18 years ago)

Author:

kjdon

Message:

some changes submitted by Emanuel Dejanu

Location:

trunk

Files:

• indexers/mgpp/text/GSDLQueryLex.cpp (modified) (4 diffs)
• mgpp/text/GSDLQueryLex.cpp (modified) (4 diffs)

trunk/indexers/mgpp/text/GSDLQueryLex.cpp

@@ -43 +43 @@
   // this version of end is used in unitool
   //  UCArray::const_iterator endMinus1 = end-1;
-  const unsigned char* endMinus1 = &(*end)-1;
+  const unsigned char* endMinus1 = &*(end - 1);
 
   int charLen;
@@ -83 +83 @@
   // this version of end is used in unitool
   //UCArray::const_iterator endMinus1 = end-1;
-  const unsigned char* endMinus1 = &(*end)-1;
+  const unsigned char* endMinus1 = &*(end - 1);
 
   int charLen=0;
@@ -123 +123 @@
                UCArray::const_iterator end,
                UCArray &text) {
+  if (here == end)
+    return false;
+
   //UCArray::const_iterator endMinus1 = end-1;
-  const unsigned char* endMinus1 = &(*end)-1;
+  const unsigned char* endMinus1 = &*(end - 1);
   const unsigned char* new_here = ParseIndexWord (&*here, endMinus1, text);
   here += (new_here - &*here); // advance iterator by number of chars advanced
@@ -137 +140 @@
 
   // strange things can happen if here == end == 0
-  if (here == end) return false;
+  if (here == end)
+    return false;
   
   // this version of end is used in unitool
   //UCArray::const_iterator endMinus1 = end-1;
-  const unsigned char* endMinus1 = &(*end)-1;
+  const unsigned char* endMinus1 = &*(end - 1);
 
   // ignore all white space

trunk/mgpp/text/GSDLQueryLex.cpp

@@ -43 +43 @@
   // this version of end is used in unitool
   //  UCArray::const_iterator endMinus1 = end-1;
-  const unsigned char* endMinus1 = &(*end)-1;
+  const unsigned char* endMinus1 = &*(end - 1);
 
   int charLen;
@@ -83 +83 @@
   // this version of end is used in unitool
   //UCArray::const_iterator endMinus1 = end-1;
-  const unsigned char* endMinus1 = &(*end)-1;
+  const unsigned char* endMinus1 = &*(end - 1);
 
   int charLen=0;
@@ -123 +123 @@
                UCArray::const_iterator end,
                UCArray &text) {
+  if (here == end)
+    return false;
+
   //UCArray::const_iterator endMinus1 = end-1;
-  const unsigned char* endMinus1 = &(*end)-1;
+  const unsigned char* endMinus1 = &*(end - 1);
   const unsigned char* new_here = ParseIndexWord (&*here, endMinus1, text);
   here += (new_here - &*here); // advance iterator by number of chars advanced
@@ -137 +140 @@
 
   // strange things can happen if here == end == 0
-  if (here == end) return false;
+  if (here == end)
+    return false;
   
   // this version of end is used in unitool
   //UCArray::const_iterator endMinus1 = end-1;
-  const unsigned char* endMinus1 = &(*end)-1;
+  const unsigned char* endMinus1 = &*(end - 1);
 
   // ignore all white space