Zorba - The XQuery Processor

Revision: 9127
          http://zorba.svn.sourceforge.net/zorba/?rev=9127&view=rev
Author:   pauljlucas
Date:     2010-10-28 21:22:48 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
Removal of warning, take 2.

Modified Paths:
--------------
    trunk/zorba/src/util/unicode_util.cpp

Modified: trunk/zorba/src/util/unicode_util.cpp
===================================================================
--- trunk/zorba/src/util/unicode_util.cpp	2010-10-28 21:01:21 UTC (rev 9126)
+++ trunk/zorba/src/util/unicode_util.cpp	2010-10-28 21:22:48 UTC (rev 9127)
@@ -2283,12 +2283,13 @@
 
 bool normalize( string const &in, normalization::type n, string *out ) {
   UErrorCode status = U_ZERO_ERROR;
-  UNormalizationMode icu_mode = UNORM_NONE; // init here to suppress warning
+  UNormalizationMode icu_mode;
   switch ( n ) {
     case normalization::NFC : icu_mode = UNORM_NFC ; break;
     case normalization::NFD : icu_mode = UNORM_NFD ; break;
     case normalization::NFKC: icu_mode = UNORM_NFKC; break;
     case normalization::NFKD: icu_mode = UNORM_NFKD; break;
+    default                 : icu_mode = UNORM_NONE; break;
   }
   Normalizer::normalize( in, icu_mode, 0, *out, status );
   return U_SUCCESS( status );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9157
          http://zorba.svn.sourceforge.net/zorba/?rev=9157&view=rev
Author:   pauljlucas
Date:     2010-11-02 15:26:29 +0000 (Tue, 02 Nov 2010)

Log Message:
-----------
1. Added missing #include <utility> (for pair).
2. Added comments for #includes.

Modified Paths:
--------------
    trunk/zorba/src/util/unicode_util.cpp

Modified: trunk/zorba/src/util/unicode_util.cpp
===================================================================
--- trunk/zorba/src/util/unicode_util.cpp	2010-11-02 13:02:49 UTC (rev 9156)
+++ trunk/zorba/src/util/unicode_util.cpp	2010-11-02 15:26:29 UTC (rev 9157)
@@ -17,7 +17,8 @@
 #include <algorithm>
 #include <cstdlib>
 #include <cwchar>
-#include <functional>
+#include <functional>                   /* for binary_function */
+#include <utility>                      /* for pair */
 
 #include <unicode/normlzr.h>
 #include <unicode/ustring.h>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9176
          http://zorba.svn.sourceforge.net/zorba/?rev=9176&view=rev
Author:   ceejatec
Date:     2010-11-04 14:50:10 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
Tweaked pair type.

Modified Paths:
--------------
    trunk/zorba/src/util/unicode_util.cpp

Modified: trunk/zorba/src/util/unicode_util.cpp
===================================================================
--- trunk/zorba/src/util/unicode_util.cpp	2010-11-04 14:26:31 UTC (rev 9175)
+++ trunk/zorba/src/util/unicode_util.cpp	2010-11-04 14:50:10 UTC (rev 9176)
@@ -2218,7 +2218,7 @@
   case_table_entry const *const end   = case_tables[ !Case ][1];
   case_table_entry entry_to_find;
   entry_to_find[0] = c;
-  pair<case_table_entry const *const, case_table_entry const *const> result =
+  pair<case_table_entry const*, case_table_entry const*> const result =
     ::equal_range( begin, end, entry_to_find, less_case_table_entry() );
   return result.first == result.second ? c : (*result.first)[1];
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9401
          http://zorba.svn.sourceforge.net/zorba/?rev=9401&view=rev
Author:   ceejatec
Date:     2010-12-01 16:57:19 +0000 (Wed, 01 Dec 2010)

Log Message:
-----------
Slightly better fix.

Modified Paths:
--------------
    trunk/zorba/src/util/unicode_util.cpp

Modified: trunk/zorba/src/util/unicode_util.cpp
===================================================================
--- trunk/zorba/src/util/unicode_util.cpp	2010-12-01 16:27:41 UTC (rev 9400)
+++ trunk/zorba/src/util/unicode_util.cpp	2010-12-01 16:57:19 UTC (rev 9401)
@@ -2265,7 +2265,7 @@
 }
 
 bool is_invalid_in_iri( code_point c ) {
-  return  c == ' '  ||
+  return  c <= ' '  ||
           c == '"'  ||
           c == '<'  ||
           c == '>'  ||
@@ -2275,7 +2275,6 @@
           c == '{'  ||
           c == '|'  ||
           c == '}'  ||
-          c < 0x20  ||
           0x7E < c;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9972
          http://zorba.svn.sourceforge.net/zorba/?rev=9972&view=rev
Author:   pauljlucas
Date:     2011-02-22 21:54:07 +0000 (Tue, 22 Feb 2011)

Log Message:
-----------
Added typedef.

Modified Paths:
--------------
    trunk/zorba/src/util/unicode_util.cpp

Modified: trunk/zorba/src/util/unicode_util.cpp
===================================================================
--- trunk/zorba/src/util/unicode_util.cpp	2011-02-22 21:15:47 UTC (rev 9971)
+++ trunk/zorba/src/util/unicode_util.cpp	2011-02-22 21:54:07 UTC (rev 9972)
@@ -2133,11 +2133,14 @@
 
 template<case_type Case>
 code_point to_case( code_point c ) {
+  typedef pair<case_table_entry const*, case_table_entry const*> range_type;
+
   case_table_entry const *const begin = case_tables[ !Case ][0];
   case_table_entry const *const end   = case_tables[ !Case ][1];
   case_table_entry entry_to_find;
   entry_to_find[0] = c;
-  pair<case_table_entry const*, case_table_entry const*> const result =
+
+  range_type const result =
     ::equal_range( begin, end, entry_to_find, less_case_table_entry() );
   return result.first == result.second ? c : (*result.first)[1];
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.