[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Fix warnings.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155244
Fix warnings.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155244
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/util/base64_util.cpp'
--- src/util/base64_util.cpp 2013-03-19 06:12:47 +
+++ src/util/base64_util.cpp 2013-03-25 14:51:30 +
@@ -207,14 +207,14 @@
size_type decode( char const *from, size_type from_len, std::vectorchar *to,
int options ) {
- size_type total_decoded = 0;
+ size_type decoded = 0;
if ( from_len ) {
std::vectorchar::size_type const orig_size = to-size();
to-resize( orig_size + decoded_size( from_len ) );
-total_decoded = decode( from, from_len, (*to)[ orig_size ], options );
-to-resize( orig_size + total_decoded );
+decoded = decode( from, from_len, (*to)[ orig_size ], options );
+to-resize( orig_size + decoded );
}
- return total_decoded;
+ return decoded;
}
size_type decode( istream from, ostream to, int options ) {
@@ -241,7 +241,6 @@
size_type decode( istream from, vectorchar *to, int options ) {
bool const ignore_ws = !!(options dopt_ignore_ws);
- vectorchar::size_type const orig_size = to-size();
size_type total_decoded = 0;
while ( !from.eof() ) {
char from_buf[ 1024 * 4 ];
@@ -253,13 +252,15 @@
gcount = from.gcount();
}
if ( gcount ) {
- to-resize( to-size() + decoded_size( gcount ) );
- total_decoded +=
+ vectorchar::size_type const orig_size = to-size();
+ to-resize( orig_size + decoded_size( gcount ) );
+ size_type const decoded =
decode( from_buf, gcount, (*to)[ total_decoded ], options );
+ to-resize( orig_size + decoded );
+ total_decoded += decoded;
} else
break;
}
- to-resize( orig_size + total_decoded );
return total_decoded;
}
=== modified file 'src/util/base64_util.h'
--- src/util/base64_util.h 2013-03-19 14:33:26 +
+++ src/util/base64_util.h 2013-03-25 14:51:30 +
@@ -134,14 +134,14 @@
templateclass ToStringType
size_type decode( char const *from, size_type from_len, ToStringType *to,
int options = dopt_none ) {
- size_type total_decoded = 0;
+ size_type decoded = 0;
if ( from_len ) {
typename ToStringType::size_type const orig_size = to-size();
to-resize( orig_size + decoded_size( from_len ) );
-total_decoded = decode( from, from_len, to-at( orig_size ), options );
-to-resize( orig_size + total_decoded );
+decoded = decode( from, from_len, to-at( orig_size ), options );
+to-resize( orig_size + decoded );
}
- return total_decoded;
+ return decoded;
}
/**
@@ -279,14 +279,14 @@
*/
templateclass ToStringType
size_type encode( char const *from, size_type from_len, ToStringType *to ) {
- size_type total_encoded = 0;
+ size_type encoded = 0;
if ( from_len ) {
typename ToStringType::size_type const orig_size = to-size();
to-resize( orig_size + encoded_size( from_len ) );
-total_encoded = encode( from, from_len, to-at( orig_size ) );
-to-resize( orig_size + total_encoded );
+encoded = encode( from, from_len, to-at( orig_size ) );
+to-resize( orig_size + encoded );
}
- return total_encoded;
+ return encoded;
}
/**
=== modified file 'src/util/hexbinary_util.cpp'
--- src/util/hexbinary_util.cpp 2013-03-19 14:27:55 +
+++ src/util/hexbinary_util.cpp 2013-03-25 14:51:30 +
@@ -110,14 +110,14 @@
from = ascii::trim_whitespace( from, from_len );
if ( from_len % 2 )
throw invalid_argument( HexBinary length is not a multiple of 2 );
- size_type total_decoded = 0;
+ size_type decoded = 0;
if ( from_len ) {
std::vectorchar::size_type const orig_size = to-size();
to-resize( orig_size + decoded_size( from_len ) );
-total_decoded = decode( from, from_len, (*to)[ orig_size ], options );
-to-resize( orig_size + total_decoded );
+decoded = decode( from, from_len, (*to)[ orig_size ], options );
+to-resize( orig_size + decoded );
}
- return total_decoded;
+ return decoded;
}
size_type decode( istream from, ostream to, int options ) {
@@ -144,7 +144,6 @@
size_type decode( istream from, vectorchar *to, int options ) {
bool const ignore_ws = !!(options dopt_ignore_ws);
- vectorchar::size_type const orig_size = to-size();
size_type total_decoded = 0;
while ( !from.eof() ) {
char from_buf[ 1024 * 4 ];
@@ -156,9 +155,12 @@
gcount = from.gcount();
}
if ( gcount ) {
- to-resize( to-size() + decoded_size( gcount ) );
- total_decoded +=
+ vectorchar::size_type const orig_size = to-size();
+ to-resize( orig_size + decoded_size( gcount ) );
+ size_type const decoded =
decode( from_buf, gcount,
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155244 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155244 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155244 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-25T15-00-51.793Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155244 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155244 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-03-25T15-00-51.793Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155244 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155244 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155244 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Now checking to see if dynamic context's lang is supported.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155143
Now checking to see if dynamic context's lang is supported.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155143
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/durations_dates_times/format_dateTime.cpp'
--- src/runtime/durations_dates_times/format_dateTime.cpp 2013-03-23 00:02:16 +
+++ src/runtime/durations_dates_times/format_dateTime.cpp 2013-03-24 15:23:24 +
@@ -1182,6 +1182,14 @@
// language defined in the dynamic context.
//
planState.theLocalDynCtx-get_locale( lang, country );
+ if ( !locale::is_supported( lang, country ) ) {
+//
+// If the language defined in the dynamic context isn't supported
+// either, try the host's language and hope for the best.
+//
+lang = locale::get_host_lang();
+lang_is_fallback = true;
+ }
}
char component;
=== modified file 'src/zorbautils/locale.h'
--- src/zorbautils/locale.h 2013-03-17 16:27:54 +
+++ src/zorbautils/locale.h 2013-03-24 15:23:24 +
@@ -297,8 +297,8 @@
}
/**
- * Gets the date format for the current locale. The format is that used by
- * strptime(3).
+ * Gets the date format in the locale specified by the given language and
+ * country. The format is that used by \c strptime(3).
*
* @param lang The language to use. Defaults to host language.
* @param country The country to use. Defaults to host country.
@@ -308,8 +308,8 @@
iso3166_1::type country = iso3166_1::unknown );
/**
- * Gets the date and time format for the current locale. The format is
- * that used by strptime(3).
+ * Gets the date and time format in the locale specified by the given
+ * language and country. The format is that used by \c strptime(3).
*
* @param lang The language to use. Defaults to host language.
* @param country The country to use. Defaults to host country.
@@ -333,7 +333,8 @@
iso639_1::type get_host_lang();
/**
- * Gets a month's abbreviation in the current locale.
+ * Gets a month's abbreviation in the locale specified by the given
+ * language and country.
*
* @param month_index The index of the month to get in the range 0-11.
* @param lang The language to use. Defaults to host language.
@@ -345,7 +346,8 @@
iso3166_1::type country = iso3166_1::unknown );
/**
- * Gets a month's full name in the current locale.
+ * Gets a month's full name in the locale specified by the given language
+ * and country.
*
* @param month_index The index of the month to get in the range 0-11.
* @param lang The language to use. Defaults to host language.
@@ -357,7 +359,8 @@
iso3166_1::type country = iso3166_1::unknown );
/**
- * Gets the time AM or PM string in the current locale.
+ * Gets the time AM or PM string in the locale specified by the given
+ * language and country.
*
* @param pm If \c true, gets the PM string; else the AM string.
* @param lang The language to use. Defaults to host language.
@@ -368,8 +371,8 @@
iso3166_1::type country = iso3166_1::unknown );
/**
- * Gets the time format for the current locale. The format is that used by
- * strptime(3).
+ * Gets the time format in the locale specified by the given language and
+ * country. The format is that used by \c strptime(3).
*
* @param lang The language to use. Defaults to host language.
* @param country The country to use. Defaults to host country.
@@ -379,7 +382,8 @@
iso3166_1::type country = iso3166_1::unknown );
/**
- * Gets a weekday's abbreviation in the current locale.
+ * Gets a weekday's abbreviation in the locale specified by the given
+ * language and country.
*
* @param day_index The index of the weekday to get in the range 0-6.
* @param lang The language to use. Defaults to host language.
@@ -391,7 +395,8 @@
iso3166_1::type country = iso3166_1::unknown );
/**
- * Gets a weekday's full name in the current locale.
+ * Gets a weekday's full name in the locale specified by the given language
+ * and country.
*
* @param day_index The index of the month to get in the range 0-6.
* @param lang The language to use. Defaults to host language.
@@ -403,7 +408,8 @@
iso3166_1::type country = iso3166_1::unknown );
/**
- * Checks if
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155143 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155143 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155143 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155143 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-24T17-38-46.315Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155143 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-03-24T17-38-46.315Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155143 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155143 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155143 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
If I choose de as a language, I get: [Language: en]Fri, 22-[Language: en]Mar-2013 14:37:51 GMT -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155084 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Needs Fixing -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155084 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
If I choose de as a language, I get: [Language: en]Fri, 22-[Language: en]Mar-2013 14:37:51 GMT That is the correct behavior when the locale information for German is not present -- which it isn't on santacruz. If you: $ cd to /usr/share/locale $ find . -name LC_TIME you'll see that no language has the proper locale information (for time) installed. If I run the query on my Mac or on the RQ machine, it prints the result in German. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155084 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155084 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155084 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155084 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-24T05-07-55.925Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155084 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-03-24T05-07-55.925Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155084 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155084 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155084 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-22T18-23-52.328Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-03-22T18-23-52.328Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
* Added over-flow check for to_xs_int().
* Fixed warnings.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038
* Added over-flow check for to_xs_int().
* Fixed warnings.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/random/random_impl.cpp'
--- src/runtime/random/random_impl.cpp 2013-02-07 17:24:36 +
+++ src/runtime/random/random_impl.cpp 2013-03-22 19:09:23 +
@@ -70,9 +70,8 @@
try
{
- int_seed = static_castunsigned int(
- to_xs_int( seed-getIntegerValue() ) );
-} catch (std::range_error /*e*/)
+ int_seed = static_castunsigned( to_xs_int( seed-getIntegerValue() ) );
+} catch (std::range_error const)
{
throw XQUERY_EXCEPTION(
zerr::ZXQD0004_INVALID_PARAMETER,
=== modified file 'src/unit_tests/test_time.cpp'
--- src/unit_tests/test_time.cpp 2013-03-20 15:26:41 +
+++ src/unit_tests/test_time.cpp 2013-03-22 19:09:23 +
@@ -90,7 +90,7 @@
/* 30 */ { 3, time::jan, 2010, calendar::ISO, 53 },
/* 31 */ { 4, time::jan, 2010, calendar::ISO, 1 },
-{ 0 },
+{ 0, 0, 0, calendar::unknown, 0 }
};
for ( test_type const *t = test; t-mday; ++t ) {
=== modified file 'src/util/stl_util.h'
--- src/util/stl_util.h 2013-02-28 11:15:32 +
+++ src/util/stl_util.h 2013-03-22 19:09:23 +
@@ -436,22 +436,29 @@
//
templatetypename N1,typename N2 inline
-typename std::enable_ifZORBA_TR1_NS::is_signedN1::value
- ZORBA_TR1_NS::is_signedN2::value,bool::type
+typename std::enable_if(ZORBA_TR1_NS::is_signedN1::value ||
+ ZORBA_TR1_NS::is_floating_pointN1::value)
+ (ZORBA_TR1_NS::is_signedN2::value ||
+ ZORBA_TR1_NS::is_floating_pointN2::value),
+bool::type
ge_min( N1 n1, N2 ) {
return n1 = std::numeric_limitsN2::min();
}
templatetypename N1,typename N2 inline
-typename std::enable_ifZORBA_TR1_NS::is_signedN1::value
- !!ZORBA_TR1_NS::is_unsignedN2::value,bool::type
+typename std::enable_if(ZORBA_TR1_NS::is_signedN1::value ||
+ ZORBA_TR1_NS::is_floating_pointN1::value)
+ !!ZORBA_TR1_NS::is_unsignedN2::value,
+ bool::type
ge_min( N1 n1, N2 ) {
return n1 = 0;
}
templatetypename N1,typename N2 inline
typename std::enable_if!!ZORBA_TR1_NS::is_unsignedN1::value
- ZORBA_TR1_NS::is_signedN2::value,bool::type
+ (ZORBA_TR1_NS::is_signedN2::value ||
+ ZORBA_TR1_NS::is_floating_pointN2::value),
+bool::type
ge_min( N1, N2 ) {
return true;
}
@@ -464,22 +471,29 @@
}
templatetypename N1,typename N2 inline
-typename std::enable_ifZORBA_TR1_NS::is_signedN1::value
- ZORBA_TR1_NS::is_signedN2::value,bool::type
+typename std::enable_if(ZORBA_TR1_NS::is_signedN1::value ||
+ ZORBA_TR1_NS::is_floating_pointN1::value)
+ (ZORBA_TR1_NS::is_signedN2::value ||
+ ZORBA_TR1_NS::is_floating_pointN2::value),
+bool::type
le_max( N1 n1, N2 ) {
return n1 = std::numeric_limitsN2::max();
}
templatetypename N1,typename N2 inline
-typename std::enable_ifZORBA_TR1_NS::is_signedN1::value
- !!ZORBA_TR1_NS::is_unsignedN2::value,bool::type
+typename std::enable_if(ZORBA_TR1_NS::is_signedN1::value ||
+ ZORBA_TR1_NS::is_floating_pointN1::value)
+ !!ZORBA_TR1_NS::is_unsignedN2::value,
+bool::type
le_max( N1 n1, N2 ) {
return n1 = 0 || static_castN2( n1 ) = std::numeric_limitsN2::max();
}
templatetypename N1,typename N2 inline
typename std::enable_if!!ZORBA_TR1_NS::is_unsignedN1::value
- ZORBA_TR1_NS::is_signedN2::value,bool::type
+ (ZORBA_TR1_NS::is_signedN2::value ||
+ ZORBA_TR1_NS::is_floating_pointN2::value),
+bool::type
le_max( N1 n1, N2 ) {
return n1 = static_castN1( std::numeric_limitsN2::max() );
}
=== modified file 'src/util/time_parse.cpp'
--- src/util/time_parse.cpp 2013-01-10 01:53:57 +
+++ src/util/time_parse.cpp 2013-03-22 19:09:23 +
@@ -170,18 +170,18 @@
// Time.
//
static rfc2822_obs_zone const rfc2822_obs_zones[] = {
- { GMT, 0 },
- { UTC, 0 }, // non-RFC: be liberal in what you accept
- { UT , 0 }, // must go after UTC
- { EDT, -4 * 60 * 60, true },
- { EST, -5 * 60 * 60 },
- { CDT, -5 * 60 * 60, true },
- { CST, -6 * 60 * 60 },
- { MDT, -6 * 60 * 60,
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-22T19-26-47.183Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-03-22T19-26-47.183Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1, Needs Information 1, Resubmit 1. Got: 1 Approve. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-22T21-57-38.259Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-03-22T21-57-38.259Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155038 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
1. Now handling locale inform returning empty string for unsupported locales.
2. Hard-coded English for locale information so English is always supported.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155084
1. Now handling locale inform returning empty string for unsupported locales.
2. Hard-coded English for locale information so English is always supported.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155084
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/durations_dates_times/format_dateTime.cpp'
--- src/runtime/durations_dates_times/format_dateTime.cpp 2013-03-22 04:29:06 +
+++ src/runtime/durations_dates_times/format_dateTime.cpp 2013-03-22 23:57:22 +
@@ -166,6 +166,9 @@
second.at_type = no_second_at;
min_width = max_width = 0;
};
+
+ // default modifier(modifier const) is fine
+ // default modifier operator(modifier const) is fine
};
///
@@ -479,32 +482,43 @@
}
static void append_month( unsigned mon, modifier const mod, zstring *dest ) {
+ modifier mod_copy( mod );
switch ( mod.first.type ) {
case modifier::name:
case modifier::Name:
case modifier::NAME: {
zstring name( locale::get_month_name( mon, mod.lang, mod.country ) );
- utf8_stringzstring u_name( name );
- if ( mod.gt_max_width( u_name.size() ) ) {
-//
-// XQuery 3.0 FO: 9.8.4.1: If the full representation of the value
-// exceeds the specified maximum width, then the processor should
-// attempt to use an alternative shorter representation that fits
-// within the maximum width. Where the presentation modifier is N, n,
-// or Nn, this is done by abbreviating the name, using either
-// conventional abbreviations if available, or crude right-truncation
-// if not.
-//
-name = locale::get_month_abbr( mon, mod.lang, mod.country );
-if ( mod.gt_max_width( u_name.size() ) )
- u_name = u_name.substr( 0, mod.max_width );
+ if ( !name.empty() ) {
+utf8_stringzstring u_name( name );
+if ( mod.gt_max_width( u_name.size() ) ) {
+ //
+ // XQuery 3.0 FO: 9.8.4.1: If the full representation of the value
+ // exceeds the specified maximum width, then the processor should
+ // attempt to use an alternative shorter representation that fits
+ // within the maximum width. Where the presentation modifier is N,
+ // n, or Nn, this is done by abbreviating the name, using either
+ // conventional abbreviations if available, or crude right-truncation
+ // if not.
+ //
+ zstring abbr = locale::get_month_abbr( mon, mod.lang, mod.country );
+ if ( !abbr.empty() ) {
+utf8_stringzstring u_abbr( abbr );
+if ( mod.gt_max_width( u_abbr.size() ) )
+ u_abbr = u_abbr.substr( 0, mod.max_width );
+name = abbr;
+ } else
+u_name = u_name.substr( 0, mod.max_width );
+}
+mod.append_if_fallback_lang( dest );
+append_string( name, mod, dest );
+break;
}
- mod.append_if_fallback_lang( dest );
- append_string( name, mod, dest );
- break;
+ mod_copy.first.type = modifier::arabic;
+ mod_copy.first.format.clear();
+ // no break;
}
default:
- append_number( mon + 1, mod, dest );
+ append_number( mon + 1, mod_copy, dest );
}
}
@@ -698,24 +712,35 @@
case modifier::Name:
case modifier::NAME: {
zstring name( locale::get_weekday_name( wday, mod.lang, mod.country ) );
- utf8_stringzstring u_name( name );
- if ( mod.gt_max_width( u_name.size() ) ) {
-//
-// XQuery 3.0 FO: 9.8.4.1: If the full representation of the value
-// exceeds the specified maximum width, then the processor should
-// attempt to use an alternative shorter representation that fits
-// within the maximum width. Where the presentation modifier is N, n,
-// or Nn, this is done by abbreviating the name, using either
-// conventional abbreviations if available, or crude right-truncation
-// if not.
-//
-name = locale::get_weekday_abbr( wday, mod.lang, mod.country );
-if ( mod.gt_max_width( u_name.size() ) )
- u_name = u_name.substr( 0, mod.max_width );
+ if ( !name.empty() ) {
+utf8_stringzstring u_name( name );
+if ( mod.gt_max_width( u_name.size() ) ) {
+ //
+ // XQuery 3.0 FO: 9.8.4.1: If the full representation of the value
+ // exceeds the specified maximum width, then the processor should
+
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/155084 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
1. Fixed typo: s/twelvth/twelfth/ -- fixed 3 FOTS failing tests.
2. Other misc. tweaks.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852
1. Fixed typo: s/twelvth/twelfth/ -- fixed 3 FOTS failing tests.
2. Other misc. tweaks.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/durations_dates_times/format_dateTime.cpp'
--- src/runtime/durations_dates_times/format_dateTime.cpp 2013-03-20 15:35:21 +
+++ src/runtime/durations_dates_times/format_dateTime.cpp 2013-03-22 04:31:30 +
@@ -204,7 +204,7 @@
{ nine, ninth },
{ ten, tenth },
{ eleven,eleventh},
- { twelve,twelveth},
+ { twelve,twelfth },
{ thirteen, thirteenth },
{ fourteen, fourteenth },
{ fifteen, fifteenth },
=== modified file 'src/runtime/full_text/thesauri/wn_types.cpp'
--- src/runtime/full_text/thesauri/wn_types.cpp 2013-02-28 11:15:32 +
+++ src/runtime/full_text/thesauri/wn_types.cpp 2013-03-22 04:31:30 +
@@ -15,11 +15,14 @@
*/
#include stdafx.h
+// standard
#include algorithm/* for lower_bound */
+// Zorba
#include util/less.h
#include diagnostics/assert.h
+// local
#include wn_types.h
using namespace std;
=== modified file 'src/zorbautils/locale.cpp'
--- src/zorbautils/locale.cpp 2013-03-19 14:41:54 +
+++ src/zorbautils/locale.cpp 2013-03-22 04:31:30 +
@@ -15,6 +15,10 @@
*/
#include stdafx.h
+// standard
+#include algorithm
+#include cstring
+#include stdexcept
#ifdef WIN32
# include windows.h
# include zorbautils/fatal.h
@@ -25,13 +29,8 @@
# include xlocale.h /* for newlocale(3) */
#endif /* WIN32 */
-#include algorithm
-#include cstring
-#include stdexcept
-
+// Zorba
#include zorba/internal/unique_ptr.h
-
-// Zorba
#include util/ascii_util.h
#include util/cxx_util.h
#include util/less.h
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-22T04-43-45.389Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Tweaked trim_* API as a prerequisite for hexBinary changes.
Other minor changes.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875
Tweaked trim_* API as a prerequisite for hexBinary changes.
Other minor changes.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/parser/symbol_table.cpp'
--- src/compiler/parser/symbol_table.cpp 2013-02-07 17:24:36 +
+++ src/compiler/parser/symbol_table.cpp 2013-03-18 17:13:24 +
@@ -32,15 +32,10 @@
namespace zorba {
-/**
- * Whitespace characters used in the functions below
- */
-static const char* whitespace = \t\r\n\f\v;
-
-
-static bool decode_string(const char *yytext, uint32_t yyleng, string *result) {
+
+static bool decode_string(const char *yytext, size_t yyleng, string *result) {
char delim = yytext [0];
- uint32_t i;
+ size_t i;
for (i = 1; i + 1 yyleng; i++) {
char ch = yytext [i];
if (ch == '') {
@@ -55,7 +50,7 @@
return true;
}
-symbol_table::symbol_table(uint32_t initial_heapsize)
+symbol_table::symbol_table(size_t initial_heapsize)
:
heap(initial_heapsize),
last_qname(-1)
@@ -66,14 +61,14 @@
{
}
-uint32_t symbol_table::size() const
+size_t symbol_table::size() const
{
- return (uint32_t)heap.size();
+ return (size_t)heap.size();
}
// bool attribute == true when an attribute value is normalized
-static void normalize_eol(const char *text, uint32_t length, string *out, bool attribute = false) {
- uint32_t i;
+static void normalize_eol(const char *text, size_t length, string *out, bool attribute = false) {
+ size_t i;
out-reserve (length + 1);
char lastCh = '\0';
for (i = 0; i length; i++) {
@@ -93,7 +88,7 @@
}
// normalizationType == 2 is used for normalizing attribute values
-off_t symbol_table::put(char const* text, uint32_t length, int normalizationType)
+off_t symbol_table::put(char const* text, size_t length, int normalizationType)
{
string normStr;
if (normalizationType == 1 || normalizationType == 2)
@@ -106,24 +101,22 @@
return heap.put(text, 0, length);
}
-off_t symbol_table::put_ncname(char const* text, uint32_t length)
+off_t symbol_table::put_ncname(char const* text, size_t length)
{
last_qname = heap.put(text, 0, length);
return last_qname;
}
-off_t symbol_table::put_qname(char const* text, uint32_t length, bool do_trim_start, bool do_trim_end, bool is_eqname)
+off_t symbol_table::put_qname(char const* text, size_t length, bool do_trim_start, bool do_trim_end, bool is_eqname)
{
if (do_trim_start)
{
-char const* temp = ascii::trim_start(text, length, whitespace);
-length -= (temp-text);
-text = temp;
+text = ascii::trim_start_whitespace(text, length);
}
if (do_trim_end)
{
-length = ascii::trim_end(text, length, whitespace);
+length = ascii::trim_end_whitespace(text, length);
}
if (!is_eqname)
@@ -148,15 +141,10 @@
return last_qname;
}
-off_t symbol_table::put_uri(char const* text, uint32_t length)
+off_t symbol_table::put_uri(char const* text, size_t length)
{
- // trim start
- char const* temp = ascii::trim_start(text, length, whitespace);
- length -= (temp-text);
- text = temp;
-
- // trim end
- length = ascii::trim_end(text, length, whitespace);
+ // trim whitespace
+ text = ascii::trim_whitespace(text, length);
// normalize whitespace
string result;
@@ -167,12 +155,12 @@
return heap.put (result.c_str (), 0, result.length ());
}
-off_t symbol_table::put_varname(char const* text, uint32_t length)
+off_t symbol_table::put_varname(char const* text, size_t length)
{
return heap.put(text, 0, length);
}
-off_t symbol_table::put_entityref(char const* text, uint32_t length)
+off_t symbol_table::put_entityref(char const* text, size_t length)
{
string result;
if (xml::parse_entity (text + 1, result) 0)
@@ -180,12 +168,12 @@
return heap.put(result.c_str(), 0, result.size ());
}
-off_t symbol_table::put_charref(char const* text, uint32_t length)
+off_t symbol_table::put_charref(char const* text, size_t length)
{
return heap.put (text + 1, 0, length - 1);
}
-off_t symbol_table::put_stringlit(char const* yytext, uint32_t yyleng)
+off_t symbol_table::put_stringlit(char const* yytext, size_t yyleng)
{
string eolNorm;
normalize_eol (yytext, yyleng, eolNorm);
@@ -195,7 +183,7 @@
return heap.put (result.c_str (), 0, result.length ());
}
-off_t symbol_table::put_commentcontent(char const* yytext, uint32_t yyleng)
+off_t symbol_table::put_commentcontent(char const* yytext, size_t yyleng)
{
string eolNorm;
normalize_eol (yytext, yyleng, eolNorm);
@@ -203,13 +191,13 @@
return heap.put (yytext, 0, yyleng);
}
-xs_decimal* symbol_table::decimalval(char const*
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Commit Message changed to: Tweaked trim_* API as a prerequisite for hexBinary changes. Other minor changes. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Description changed to: Tweaked trim_* API as a prerequisite for hexBinary changes. Other minor changes. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-18T17-15-51.348Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The attempt to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job pjl-misc-2013-03-18T17-15-51.348Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1, Needs Information 1, Resubmit 1. Got: 1 Approve. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-03-19T01-27-46.173Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-19T03-45-49.963Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-03-19T03-45-49.963Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153875 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba. Commit message: Fix negative time-zone bug for cases like -00:30, i.e., hours is zero, but minutes are negative. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 Fix negative time-zone bug for cases like -00:30, i.e., hours is zero, but minutes are negative. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/zorbatypes/datetime/timezone.cpp' --- src/zorbatypes/datetime/timezone.cpp 2013-02-28 11:15:32 + +++ src/zorbatypes/datetime/timezone.cpp 2013-03-13 03:17:21 + @@ -108,6 +108,8 @@ tz = TimeZone(hours); tz.data[MINUTE_DATA] = std::abs(minutes); tz.data[SECONDS_DATA] = std::abs(seconds); + if ( minutes 0 || seconds 0 ) // hours is checked in TimeZone() ctor +tz.is_negative = true; tz.normalize(); return 0; } -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-13T03-18-39.352Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
FYI: this change fixes 13 failing FOTS format-dateTime tests all by itself. I suspect there are more bugs in the code dateTime/timezone code than in the formatting code. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-03-13T03-18-39.352Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-13T04-31-43.245Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-03-13T04-31-43.245Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/153046 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Moved itoa() functions from ztd namespace to ascii namespace since (A) it
converts using only ASCII digits and (B) preparation for the forthcoming
utf8::itoa() that will convert using an sequence of Unicode digits.
Requested reviews:
Matthias Brantner (matthias-brantner)
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152695
Moved itoa() functions from ztd namespace to ascii namespace since (A) it
converts using only ASCII digits and (B) preparation for the forthcoming
utf8::itoa() that will convert using an sequence of Unicode digits.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152695
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/api/serialization/serializer.cpp'
--- src/api/serialization/serializer.cpp 2013-03-07 10:10:10 +
+++ src/api/serialization/serializer.cpp 2013-03-11 15:03:21 +
@@ -214,8 +214,8 @@
if (cp = 0x1 cp = 0x10)
{
-ztd::itoa_buf_type cp_buf;
-tr # ztd::itoa(cp, cp_buf) ';';
+ascii::itoa_buf_type cp_buf;
+tr # ascii::itoa(cp, cp_buf) ';';
chars += (char_length-1);
}
else
=== modified file 'src/store/naive/loader_fast.cpp'
--- src/store/naive/loader_fast.cpp 2013-02-26 04:12:43 +
+++ src/store/naive/loader_fast.cpp 2013-03-11 15:03:21 +
@@ -41,6 +41,7 @@
#include diagnostics/xquery_diagnostics.h
#include diagnostics/assert.h
+#include util/ascii_util.h
#include util/stream_util.h
namespace zorba {
@@ -104,11 +105,11 @@
if ( error-level == XML_ERR_NONE )
return;
- ztd::itoa_buf_type itoa_buf;
+ ascii::itoa_buf_type itoa_buf;
zstring libxml_dict_key_4( ZED_PREFIX libxml_ );
libxml_dict_key_4 += error-level == XML_ERR_WARNING ? WAR_ : ERR_;
- libxml_dict_key_4 += ztd::itoa( error-code, itoa_buf );
+ libxml_dict_key_4 += ascii::itoa( error-code, itoa_buf );
char const *const error_str1_5 = error-str1 ? error-str1 : ;
char const *const error_str2_6 = error-str2 ? error-str2 : ;
@@ -130,7 +131,7 @@
case XML_ERR_INTERNAL_ERROR:
case XML_ERR_TAG_NOT_FINISHED:
// For these error codes, int1 is an int.
-error_int1_8 = ztd::itoa( error-int1, itoa_buf );
+error_int1_8 = ascii::itoa( error-int1, itoa_buf );
break;
default:
// For an unaccounted-for error code, use a heuristic to guess whether
@@ -138,7 +139,7 @@
if ( ascii::is_print( error-int1 ) )
error_int1_8 = static_castchar( error-int1 );
else
- error_int1_8 = ztd::itoa( error-int1, itoa_buf );
+ error_int1_8 = ascii::itoa( error-int1, itoa_buf );
} // switch
} // if
=== modified file 'src/unit_tests/test_time_parse.cpp'
--- src/unit_tests/test_time_parse.cpp 2013-01-10 00:59:49 +
+++ src/unit_tests/test_time_parse.cpp 2013-03-11 15:03:21 +
@@ -22,6 +22,7 @@
#include stdexcept
#include string
+#include util/ascii_util.h
#include util/stl_util.h
#include util/time_parse.h
#include zorbatypes/zstring.h
@@ -178,13 +179,13 @@
static void test_range( char const *conv, int low, int high,
ztm_int_ptr ztm_mbr,
unary_fn_type unary_fn = my_identity ) {
- ztd::itoa_buf_type buf;
+ ascii::itoa_buf_type buf;
iso639_1::type lang = iso639_1::unknown;
iso3166_1::type country = iso3166_1::unknown;
ztm tm;
for ( int i = low; i = high; ++i ) {
-ztd::itoa( i, buf );
+ascii::itoa( i, buf );
size_t const len = ::strlen( buf );
char const *bp;
::memset( tm, 0, sizeof( tm ) );
@@ -196,14 +197,14 @@
time::parse( JUNK, conv, lang, country, tm ), invalid_value
);
- ztd::itoa( --low, buf );
+ ascii::itoa( --low, buf );
ASSERT_EXCEPTION(
time::parse( buf, conv, lang, country, tm ), invalid_value
);
int const high2 = high + 1;
if ( num_digits( high2 ) == num_digits( high ) ) {
-ztd::itoa( ++high, buf );
+ascii::itoa( ++high, buf );
ASSERT_EXCEPTION(
time::parse( buf, conv, lang, country, tm ), invalid_value
);
=== modified file 'src/util/ascii_util.cpp'
--- src/util/ascii_util.cpp 2013-02-26 04:12:43 +
+++ src/util/ascii_util.cpp 2013-03-11 15:03:21 +
@@ -37,6 +37,44 @@
return true;
}
+char* itoa( long long n, char *buf ) {
+ //
+ // This implementation is much faster than using sprintf(3).
+ //
+ char *s = buf;
+ long long n_prev;
+ do {
+n_prev = n;
+n /= 10;
+*s++ = 9876543210123456789 [ 9 + n_prev - n * 10 ];
+ } while ( n );
+
+ if ( n_prev 0 ) *s++ = '-';
+ *s = '\0';
+
+ for ( char *t = buf; t s; ++t ) {
+char const c = *--s; *s = *t; *t = c;
+ }
+ return buf;
+}
+
+char* itoa( unsigned long long n, char *buf ) {
+ char *s = buf;
+ unsigned long long n_prev;
+ do {
+n_prev = n;
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152695 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152695 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152695 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152695 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-11T16-02-48.554Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152695 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-03-11T16-02-48.554Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152695 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152695 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152695 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Fixed warnings, mostly.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152813
Fixed warnings, mostly.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152813
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/unit_tests/test_time_parse.cpp'
--- src/unit_tests/test_time_parse.cpp 2013-03-11 15:00:50 +
+++ src/unit_tests/test_time_parse.cpp 2013-03-12 03:36:23 +
@@ -105,7 +105,7 @@
iso639_1::type lang = iso639_1::unknown;
iso3166_1::type country = iso3166_1::unknown;
ztm tm;
- char const *bp;
+ char const *bp = nullptr;
::memset( tm, 0, sizeof( tm ) );
ASSERT_NO_EXCEPTION( bp = time::parse( buf, fmt, lang, country, tm ) );
@@ -127,7 +127,7 @@
ztm tm;
for ( int i = 0; i limit; ++i ) {
-char const *bp;
+char const *bp = nullptr;
{
zstring const buf = (*locale_fn)( i, lang, country );
::memset( tm, 0, sizeof( tm ) );
@@ -187,7 +187,7 @@
for ( int i = low; i = high; ++i ) {
ascii::itoa( i, buf );
size_t const len = ::strlen( buf );
-char const *bp;
+char const *bp = nullptr;
::memset( tm, 0, sizeof( tm ) );
ASSERT_NO_EXCEPTION( bp = time::parse( buf, conv, lang, country, tm ) )
ASSERT_TRUE( bp == buf + len );
@@ -241,7 +241,7 @@
{ %j %F, 33 2013-02-01 }, // day is 32
{ %j %F, 60 2012-03-01 }, // day is 61
{ %j %F, 62 2012-03-01 }, // day is 61
-0
+{ 0, 0 }
};
iso639_1::type lang = iso639_1::unknown;
iso3166_1::type country = iso3166_1::unknown;
@@ -260,7 +260,7 @@
iso639_1::type lang = iso639_1::unknown;
iso3166_1::type country = iso3166_1::unknown;
ztm tm;
- char const *bp;
+ char const *bp = nullptr;
::memset( tm, 0, sizeof( tm ) );
ASSERT_NO_EXCEPTION( bp = time::parse( buf, %D, lang, country, tm ) )
@@ -275,7 +275,7 @@
iso639_1::type lang = iso639_1::unknown;
iso3166_1::type country = iso3166_1::unknown;
ztm tm;
- char const *bp;
+ char const *bp = nullptr;
::memset( tm, 0, sizeof( tm ) );
ASSERT_NO_EXCEPTION( bp = time::parse( buf, %F, lang, country, tm ) )
@@ -302,7 +302,7 @@
}
}
-static void test_j() { // dat of year: 001-366
+static void test_j() { // day of year: 001-366
char const *const buf = 2012-1-2;
iso639_1::type lang = iso639_1::unknown;
iso3166_1::type country = iso3166_1::unknown;
@@ -310,7 +310,7 @@
char const *bp;
::memset( tm, 0, sizeof( tm ) );
- ASSERT_NO_EXCEPTION( bp = time::parse( buf, %F, lang, country, tm ) )
+ ASSERT_NO_EXCEPTION( bp = time::parse( buf, %j, lang, country, tm ) )
ASSERT_TRUE( bp == buf + ::strlen( buf ) );
ASSERT_TRUE( tm.tm_yday == 0 );
}
@@ -354,7 +354,7 @@
ztm tm;
for ( gmt_test const *p = gmt_tests; p-s_off; ++p ) {
-char const *bp;
+char const *bp = nullptr;
::memset( tm, 0, sizeof( tm ) );
ASSERT_NO_EXCEPTION(
bp = time::parse( p-s_off, %z, lang, country, tm )
@@ -408,6 +408,7 @@
test_D();
test_F();
test_invalid_specification();
+ test_j();
test_literals();
test_zZ();
=== modified file 'src/util/ascii_util.cpp'
--- src/util/ascii_util.cpp 2013-03-11 15:00:50 +
+++ src/util/ascii_util.cpp 2013-03-12 03:36:23 +
@@ -16,6 +16,7 @@
#include stdafx.h
// standard
+#include algorithm
#include cstring
#include iomanip
@@ -51,27 +52,20 @@
if ( n_prev 0 ) *s++ = '-';
*s = '\0';
-
- for ( char *t = buf; t s; ++t ) {
-char const c = *--s; *s = *t; *t = c;
- }
+ std::reverse( buf, s );
return buf;
}
char* itoa( unsigned long long n, char *buf ) {
char *s = buf;
- unsigned long long n_prev;
do {
-n_prev = n;
+unsigned long long const n_prev = n;
n /= 10;
*s++ = 0123456789 [ n_prev - n * 10 ];
} while ( n );
*s = '\0';
-
- for ( char *t = buf; t s; ++t ) {
-char const c = *--s; *s = *t; *t = c;
- }
+ std::reverse( buf, s );
return buf;
}
=== modified file 'src/util/ascii_util.h'
--- src/util/ascii_util.h 2013-03-11 15:00:50 +
+++ src/util/ascii_util.h 2013-03-12 03:36:23 +
@@ -665,9 +665,9 @@
/**
* A type that can hold the largest possible C string equivalent of the largest
- * possible integral value.
+ * possible integral value (assuming 8 bytes for a codelong long/code).
*/
-typedef char itoa_buf_type[48];
+typedef char itoa_buf_type[ 20 + 1 /* for null */ ];
/**
* Converts a codelong long/code to a C string.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152813 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152813 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152813 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152813 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-12T03-53-42.859Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152813 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-03-12T03-53-42.859Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152813 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152813 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152813 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-08T00-11-49.889Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-03-08T00-11-49.889Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/151861 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Added locale to dynamic context. (This is needed to implement format-date()
correctly.)
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319
Added locale to dynamic context. (This is needed to implement format-date()
correctly.)
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/dynamic_context.h'
--- include/zorba/dynamic_context.h 2013-02-07 17:24:36 +
+++ include/zorba/dynamic_context.h 2013-03-08 04:27:22 +
@@ -21,6 +21,7 @@
#include memory
#include zorba/config.h
+#include zorba/locale.h
#include zorba/api_shared_types.h
#include zorba/static_context_consts.h
#include zorba/xmldatamanager.h
@@ -247,6 +248,26 @@
virtual Item
getDefaultCollection() const = 0;
+ /** \brief Sets the locale.
+ *
+ * @param aLang The language to set.
+ * @param aCountry The country to set.
+ */
+ virtual void
+ setLocale( locale::iso639_1::type aLang,
+ locale::iso3166_1::type aCountry ) = 0;
+
+ /** \brief Gets the locale.
+ *
+ * @param aLang A pointer to a \c iso639_1::type to receive the language.
+ * If \c null, this is not set.
+ * @param aCountry A pointer to a \c iso3166_1::type to receive the country.
+ * If \c null, this is not set.
+ */
+ virtual void
+ getLocale( locale::iso639_1::type *aLang,
+ locale::iso3166_1::type *aCountry ) const = 0;
+
/** \brief Add a name-value pair to this context.
* The value can be accessed in the evaluate method
* of external functions (see ContextualExternalFunction).
=== modified file 'include/zorba/locale.h'
--- include/zorba/locale.h 2013-02-07 17:24:36 +
+++ include/zorba/locale.h 2013-03-08 04:27:22 +
@@ -218,6 +218,262 @@
};
}
+/**
+ * Defines constants for all ISO 3166-1 country codes.
+ */
+namespace iso3166_1 {
+ enum type {
+unknown,
+AD, /// Andorra
+AE, /// United Arab Emirates
+AF, /// Afghanistan
+AG, /// Antigua and Barbuda
+AI, /// Anguilla
+AL, /// Albania
+AM, /// Armenia
+AN, /// Netherlands Antilles
+AO, /// Angola
+AQ, /// Antarctica
+AR, /// Argentina
+AS, /// American Samoa
+AT, /// Austria
+AU, /// Australia
+AW, /// Aruba
+AX, /// Aland Islands
+AZ, /// Azerbaijan
+BA, /// Bosnia and Herzegovina
+BB, /// Barbados
+BD, /// Bangladesh
+BE, /// Belgium
+BF, /// Burkina Faso
+BG, /// Bulgaria
+BH, /// Bahrain
+BI, /// Burundi
+BJ, /// Benin
+BL, /// Saint Barthelemy
+BM, /// Bermuda
+BN, /// Brunei Darussalam
+BO, /// Bolivia
+BR, /// Brazil
+BS, /// Bahamas
+BT, /// Bhutan
+BV, /// Bouvet Island
+BW, /// Botswana
+BY, /// Belarus
+BZ, /// Belize
+CA, /// Canada
+CC, /// Cocos Islands
+CD, /// Congo
+CF, /// Central African Republic
+CG, /// Congo
+CH, /// Switzerland
+CI, /// Cote D'Ivoire
+CK, /// Cook Islands
+CL, /// Chile
+CM, /// Cameroon
+CN, /// China
+CO, /// Colombia
+CR, /// Costa Rica
+CU, /// Cuba
+CV, /// Cape Verde
+CX, /// Christmas Island
+CY, /// Cyprus
+CZ, /// Czech Republic
+DE, /// Germany
+DJ, /// Djibouti
+DK, /// Denmark
+DM, /// Dominica
+DO, /// Dominican Republic
+DZ, /// Algeria
+EC, /// Ecuador
+EE, /// Estonia
+EG, /// Egypt
+EH, /// Western Sahara
+ER, /// Eritrea
+ES, /// Spain
+ET, /// Ethiopia
+FI, /// Finland
+FJ, /// Fiji
+FK, /// Falkland Islands
+FM, /// Micronesia
+FO, /// Faroe Islands
+FR, /// France
+GA, /// Gabon
+GB, /// United Kingdom
+GD, /// Grenada
+GE, /// Georgia
+GF, /// French Guiana
+GG, /// Guernsey
+GH, /// Ghana
+GI, /// Gibraltar
+GL, /// Greenland
+GM, /// Gambia
+GN, /// Guinea
+GP, /// Guadeloupe
+GQ, /// Equatorial Guinea
+GR, /// Greece
+GS, /// South Georgia and the South Sandwich Islands
+GT, /// Guatemala
+GU, /// Guam
+GW, /// Guinea-Bissau
+GY, /// Guyana
+HK, /// Hong Kong
+HM, /// Heard Island and Mcdonald Islands
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/152319 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
