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/218862 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/218862 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/218862 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 succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/218862 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/218862 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/218862 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/218862 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/218862 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/218862 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 JSON-to-XML bug. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/218862 Fixed JSON-to-XML bug. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/218862 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/json/json-csv.jq' --- modules/json/json-csv.jq 2014-03-05 23:36:00 + +++ modules/json/json-csv.jq 2014-05-08 18:38:36 + @@ -141,7 +141,6 @@ : character. : @error csv:INVALID_CSV_VALUE if a value of some key is not castable to : string. - : codefield-names/code option is not a string. : @error csv:MISSING_VALUE if a missing value is detected and the : codemissing-value/code option is codeerror/code. : @error csv:EXTRA_VALUE if an extra value is detected and the === modified file 'src/runtime/json/snelson.cpp' --- src/runtime/json/snelson.cpp 2014-03-20 01:59:46 + +++ src/runtime/json/snelson.cpp 2014-05-08 18:38:36 + @@ -176,10 +176,9 @@ POP_ITERATOR(); POP_STATE(); POP_ITEM_ELEMENT(); - if ( IN_STATE( in_object ) ) { + if ( IN_STATE( in_object ) ) POP_ITEM( xml ); -POP_ITEM( json ); - } + POP_ITEM( json ); continue; } if ( IN_STATE( in_object ) ) { @@ -198,7 +197,6 @@ case store::JS_NULL: ADD_TYPE_ATTRIBUTE( null ); ADD_ITEM_ELEMENT( null ); -POP_ITEM_ELEMENT(); break; case store::XS_BOOLEAN: @@ -206,7 +204,6 @@ ADD_ITEM_ELEMENT( boolean ); value_str = value_item-getBooleanValue() ? true : false; GENV_ITEMFACTORY-createTextNode( junk_item, xml_item, value_str ); -POP_ITEM_ELEMENT(); break; case store::XS_BYTE: @@ -229,7 +226,6 @@ ADD_ITEM_ELEMENT( number ); value_str = value_item-getStringValue(); GENV_ITEMFACTORY-createTextNode( junk_item, xml_item, value_str ); -POP_ITEM_ELEMENT(); break; default: @@ -237,8 +233,8 @@ ADD_ITEM_ELEMENT( string ); value_str = value_item-getStringValue(); GENV_ITEMFACTORY-createTextNode( junk_item, xml_item, value_str ); -POP_ITEM_ELEMENT(); } // switch +POP_ITEM_ELEMENT(); break; case store::Item::ARRAY: === added file 'test/rbkt/ExpQueryResults/zorba/json/json-snelson-j2x-object-07.xml.res' --- test/rbkt/ExpQueryResults/zorba/json/json-snelson-j2x-object-07.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/json/json-snelson-j2x-object-07.xml.res 2014-05-08 18:38:36 + @@ -0,0 +1,10 @@ +json xmlns=http://john.snelson.org.uk/parsing-json-into-xquery; type=object + pair name=a type=object +pair name=b type=array + item type=object +pair name=c type=null/ + /item +/pair + /pair + pair name=d type=null/ +/json === added file 'test/rbkt/Queries/zorba/json/json-snelson-j2x-object-07.xq' --- test/rbkt/Queries/zorba/json/json-snelson-j2x-object-07.xq 1970-01-01 00:00:00 + +++ test/rbkt/Queries/zorba/json/json-snelson-j2x-object-07.xq 2014-05-08 18:38:36 + @@ -0,0 +1,12 @@ +import module namespace jx = http://zorba.io/modules/json-xml;; + +let $json := + { +a : { + b : [ { c : null } ] +}, +d : null + } +return jx:json-to-xml( $json ) + +(: vim:set et sw=2 ts=2: :) -- 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/218862 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 missing #include cassert all over. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/216803 Added missing #include cassert all over. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/216803 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/api/item_seq_chainer.h' --- src/api/item_seq_chainer.h 2013-08-01 11:59:51 + +++ src/api/item_seq_chainer.h 2014-04-23 00:41:51 + @@ -19,7 +19,7 @@ #include vector #include set -#include assert.h +#include cassert #include zorba/config.h #include zorba/item_sequence.h === modified file 'src/runtime/base/narybase.h' --- src/runtime/base/narybase.h 2014-02-12 02:25:45 + +++ src/runtime/base/narybase.h 2014-04-23 00:41:51 + @@ -17,6 +17,7 @@ #ifndef ZORBA_RUNTIME_NARY_ITERATOR #define ZORBA_RUNTIME_NARY_ITERATOR +#include cassert #include vector #include common/shared_types.h === modified file 'src/runtime/base/unarybase.h' --- src/runtime/base/unarybase.h 2014-02-12 02:25:45 + +++ src/runtime/base/unarybase.h 2014-04-23 00:41:51 + @@ -17,6 +17,8 @@ #ifndef ZORBA_RUNTIME_UNARY_ITERATOR #define ZORBA_RUNTIME_UNARY_ITERATOR +#include cassert + #include common/shared_types.h #include runtime/base/plan_iterator.h === modified file 'src/runtime/util/handle_hashmap_item_value.h' --- src/runtime/util/handle_hashmap_item_value.h 2013-02-07 17:24:36 + +++ src/runtime/util/handle_hashmap_item_value.h 2014-04-23 00:41:51 + @@ -16,6 +16,8 @@ #ifndef ZORBA_STORE_HANDLE_HAHSET_ITEM_VALUE_H #define ZORBA_STORE_HANDLE_HAHSET_ITEM_VALUE_H +#include cassert + #include zorbautils/hashmap.h #include runtime/booleans/BooleanImpl.h #include runtime/api/runtimecb.h === modified file 'src/store/naive/atomic_items.h' --- src/store/naive/atomic_items.h 2013-06-26 10:59:37 + +++ src/store/naive/atomic_items.h 2014-04-23 00:41:51 + @@ -17,11 +17,12 @@ #ifndef ZORBA_STORE_ATOMIC_ITEMS_H #define ZORBA_STORE_ATOMIC_ITEMS_H -#include zorba/config.h +#include cassert #include iostream #include vector #include cstring +#include zorba/config.h #include zorba/streams.h #ifndef ZORBA_NO_FULL_TEXT #include zorba/tokenizer.h === modified file 'src/store/naive/node_items.h' --- src/store/naive/node_items.h 2013-06-29 08:38:53 + +++ src/store/naive/node_items.h 2014-04-23 00:41:51 + @@ -17,6 +17,7 @@ #ifndef ZORBA_SIMPLE_STORE_NODE_ITEMS #define ZORBA_SIMPLE_STORE_NODE_ITEMS +#include cassert #include stack #include vector === modified file 'src/store/naive/node_iterators.h' --- src/store/naive/node_iterators.h 2013-06-15 02:57:08 + +++ src/store/naive/node_iterators.h 2014-04-23 00:41:51 + @@ -16,6 +16,7 @@ #ifndef ZORBA_SIMPLE_STORE_NODE_ITERATORS #define ZORBA_SIMPLE_STORE_NODE_ITERATORS +#include cassert #include set #include vector === modified file 'src/store/naive/ordpath.h' --- src/store/naive/ordpath.h 2013-02-26 04:12:43 + +++ src/store/naive/ordpath.h 2014-04-23 00:41:51 + @@ -17,6 +17,7 @@ #ifndef ZORBA_STORE_ORDPATH_H #define ZORBA_STORE_ORDPATH_H +#include cassert #include vector #include zorba/config.h === modified file 'src/store/naive/simple_index_general.h' --- src/store/naive/simple_index_general.h 2013-02-07 17:24:36 + +++ src/store/naive/simple_index_general.h 2014-04-23 00:41:51 + @@ -16,6 +16,7 @@ #ifndef ZORBA_SIMPLE_STORE_INDEX_HASH_GENERAL #define ZORBA_SIMPLE_STORE_INDEX_HASH_GENERAL +#include cassert #include map #include simple_index.h === modified file 'src/store/naive/text_node_content.h' --- src/store/naive/text_node_content.h 2013-02-07 17:24:36 + +++ src/store/naive/text_node_content.h 2014-04-23 00:41:51 + @@ -17,6 +17,7 @@ #ifndef ZORBA_SIMPLE_STORE_TEXT_NODE_CONTENT #define ZORBA_SIMPLE_STORE_TEXT_NODE_CONTENT +#include cassert #include cstring /* for memset(3) */ #include shared_types.h === modified file 'src/system/globalenv.h' --- src/system/globalenv.h 2013-12-25 03:43:06 + +++ src/system/globalenv.h 2014-04-23 00:41:51 + @@ -17,6 +17,8 @@ #ifndef ZORBA_GLOBALENV_H #define ZORBA_GLOBALENV_H +#include cassert + #include zorba/config.h #include zorba/internal/unique_ptr.h === modified file 'src/types/typeimpl.h' --- src/types/typeimpl.h 2013-09-23 09:11:02 + +++ src/types/typeimpl.h 2014-04-23 00:41:51 + @@ -17,6 +17,8 @@ #ifndef ZORBA_TYPEIMPL_H #define ZORBA_TYPEIMPL_H +#include cassert + #include common/shared_types.h #include types/node_test.h === modified file 'src/util/string/default_rep.h' --- src/util/string/default_rep.h 2013-08-02 18:56:15 + +++ src/util/string/default_rep.h 2014-04-23 00:41:51 + @@ -17,6 +17,7 @@ #ifndef ZORBA_RSTRING_DEFAULT_REP_H #define ZORBA_RSTRING_DEFAULT_REP_H +#include
[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/216803 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/216803 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/216803 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/216803 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/216803 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/216803 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/216803 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/216803 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 CSV quote-parsing bug. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/215776 Fixed CSV quote-parsing bug. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/215776 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/util/csv_parser.cpp' --- src/util/csv_parser.cpp 2014-03-06 19:06:43 + +++ src/util/csv_parser.cpp 2014-04-14 23:00:32 + @@ -20,10 +20,22 @@ // local #include csv_parser.h +using namespace std; + namespace zorba { /// +inline bool peek( istream is, char c ) { + char const temp = is.peek(); + bool const peeked = is.good(); + if ( peeked ) +c = temp; + return peeked; +} + +/// + bool csv_parser::next_value( zstring *value, bool *eol, bool *quoted ) const { ztd::string_appenderzstring,128 appender( value ); char c; @@ -35,7 +47,9 @@ while ( is_-get( c ) ) { if ( in_quote ) { if ( quote_esc_ == quote_ ) { // -if ( c == quote_ (c = is_-peek(), is_-good()) ) { +if ( c == quote_ ) { + if ( !peek( *is_, c ) ) +break; if ( c != quote_ ) { in_quote = false; continue; @@ -61,7 +75,7 @@ } switch ( c ) { case '\r': - if ( ((c = is_-peek()), is_-good()) c == '\n' ) + if ( peek( *is_, c ) c == '\n' ) is_-get(); // no break; case '\n': === added file 'test/rbkt/ExpQueryResults/zorba/csv/csv-parse-02.xml.res' --- test/rbkt/ExpQueryResults/zorba/csv/csv-parse-02.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/csv/csv-parse-02.xml.res 2014-04-14 23:00:32 + @@ -0,0 +1,4 @@ +{ + key_1 : value_1, + key_2 : value_2 +} === added file 'test/rbkt/Queries/zorba/csv/csv-parse-02.jq' --- test/rbkt/Queries/zorba/csv/csv-parse-02.jq 1970-01-01 00:00:00 + +++ test/rbkt/Queries/zorba/csv/csv-parse-02.jq 2014-04-14 23:00:32 + @@ -0,0 +1,9 @@ +xquery version 1.0; + +import module namespace csv = http://zorba.io/modules/json-csv;; + +let $csvString2 := key_1,key_2 +value_1,value_2 +return csv:parse( $csvString2 ) + +(: vim:set et sw=2 ts=2: :) === added file 'test/rbkt/Queries/zorba/csv/csv-parse-02.spec' --- test/rbkt/Queries/zorba/csv/csv-parse-02.spec 1970-01-01 00:00:00 + +++ test/rbkt/Queries/zorba/csv/csv-parse-02.spec 2014-04-14 23:00:32 + @@ -0,0 +1,1 @@ +Serialization: indent=yes -- 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/215776 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/215776 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/215776 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/215776 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/215776 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/215776 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 succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/215776 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/215776 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/215776 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/213942 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/213942 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/213942 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/213942 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: 1. Fixed user-reported core-dump for JSON-to-XML conversion. 2. Now also using getNameAsString() in PlanIterator. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 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. Commit Message changed to: 1. Fixed user-reported core-dump for JSON-to-XML conversion. 2. Now also using getNameAsString() in PlanIterator. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 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
Voting criteria failed for the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 : Votes: {'Approve': 1} -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 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 result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 Stage CommitZorba failed. Check console output at http://jenkins.lambda.nu:8180/job/CommitZorba/309/console to view the results. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 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/211848 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211848 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/211150 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 parser changes are the unintentional consequences of the recent orthogonal parser changes on the no_commas branch. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211150 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/211150 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211150 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211150 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/211150 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211150 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 succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211150 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/210509 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/210509 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/210509 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/210509 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/210509 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 result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/210509 Stage BuildZorbaUbuntu failed. Check compiler output at http://jenkins.lambda.nu:8180/job/BuildZorbaUbuntu/542/parsed_console to view the results. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/210509 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 result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/210509 Stage TestZorbaUbuntu failed. 23 tests failed (8757 total tests run). Check test results at http://jenkins.lambda.nu:8180/job/TestZorbaUbuntu/478/testReport/ to view the results. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/210509 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. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/runtime/csv/csv_impl.cpp' --- src/runtime/csv/csv_impl.cpp 2014-03-01 01:57:00 + +++ src/runtime/csv/csv_impl.cpp 2014-03-06 19:08:12 + @@ -365,7 +365,7 @@ store::Item_t item; vectorstore::Item_t keys_copy, values; setunsigned keys_omit; - zstring value; + zstring *value; bool eol, quoted, swap_keys = false; CsvParseIteratorState *state; @@ -381,7 +381,8 @@ set_options( item, state ); } - while ( state-csv_.next_value( value, eol, quoted ) ) { + while ( state-csv_.next_value( state-value_, eol, quoted ) ) { +value = state-value_; if ( state-keys_.size() values.size() == state-keys_.size() state-extra_name_.empty() ) { // @@ -390,13 +391,13 @@ // throw XQUERY_EXCEPTION( csv::EXTRA_VALUE, -ERROR_PARAMS( value, state-line_no_ ), +ERROR_PARAMS( *value, state-line_no_ ), ERROR_LOC( loc ) ); } item = nullptr; -if ( value.empty() ) { +if ( value-empty() ) { if ( state-keys_.empty() ) { // // Header field names can never be empty. @@ -408,7 +409,7 @@ ); } if ( quoted ) -GENV_ITEMFACTORY-createString( item, value ); +GENV_ITEMFACTORY-createString( item, *value ); else switch ( state-missing_ ) { case missing::error: @@ -421,15 +422,15 @@ break; } } else if ( state-cast_unquoted_ !quoted !state-keys_.empty() ) { - if ( value == T || value == Y ) + if ( *value == T || *value == Y ) GENV_ITEMFACTORY-createBoolean( item, true ); - else if ( value == F || value == N ) + else if ( *value == F || *value == N ) GENV_ITEMFACTORY-createBoolean( item, false ); else { json::token t; -switch ( parse_json( value, t ) ) { +switch ( parse_json( *value, t ) ) { case json::boolean: -GENV_ITEMFACTORY-createBoolean( item, value[0] == 't' ); +GENV_ITEMFACTORY-createBoolean( item, (*value)[0] == 't' ); break; case json::null: GENV_ITEMFACTORY-createJSONNull( item ); @@ -437,24 +438,24 @@ case json::number: switch ( t.get_numeric_type() ) { case json::token::integer: -GENV_ITEMFACTORY-createInteger( item, xs_integer( value ) ); +GENV_ITEMFACTORY-createInteger( item, xs_integer( *value ) ); break; case json::token::decimal: -GENV_ITEMFACTORY-createDecimal( item, xs_decimal( value ) ); +GENV_ITEMFACTORY-createDecimal( item, xs_decimal( *value ) ); break; case json::token::floating_point: -GENV_ITEMFACTORY-createDouble( item, xs_double( value ) ); +GENV_ITEMFACTORY-createDouble( item, xs_double( *value ) ); break; default: ZORBA_ASSERT( false ); } break; default: -GENV_ITEMFACTORY-createString( item, value ); +GENV_ITEMFACTORY-createString( item, *value ); } // switch } // else } else { - GENV_ITEMFACTORY-createString( item, value ); + GENV_ITEMFACTORY-createString( item, *value ); } if ( !item.isNull() ) === modified file 'src/runtime/csv/pregenerated/csv.h' --- src/runtime/csv/pregenerated/csv.h 2014-01-31 21:47:54 + +++ src/runtime/csv/pregenerated/csv.h 2014-03-06 19:08:12 + @@ -57,6 +57,7 @@ missing::type missing_; // bool skip_called_; // zstring string_; // + zstring value_; // CsvParseIteratorState(); === modified file 'src/runtime/spec/csv/csv.xml' --- src/runtime/spec/csv/csv.xml 2014-02-28 01:46:12 + +++ src/runtime/spec/csv/csv.xml 2014-03-06 19:08:12 + @@ -39,6 +39,7 @@ zorba:member type=missing::type name=missing_ defaultValue=missing::null/ zorba:member type=bool name=skip_called_ defaultValue=false/ zorba:member type=zstring name=string_/ +zorba:member type=zstring name=value_/ /zorba:state zorba:method name=count const=true return=bool zorba:param name=result type=store::Item_tamp;/ === modified file 'src/store/naive/simple_item_factory.cpp' --- src/store/naive/simple_item_factory.cpp 2013-09-17 21:12:49 + +++ src/store/naive/simple_item_factory.cpp 2014-03-06 19:08:12 + @@ -2366,19 +2366,20 @@ const std::vectorstore::Item_t names, const std::vectorstore::Item_t values) { + assert( names.size() == values.size() ); + result = new
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
1. In a couple of cases, now reusing the same zstring so the cost of growing the string is not paid per value. 2. Added a string_appender class that chunks the appending of single characters onto the end of strings to reduce the number of times zstring::append() is called. 3. Improved creating of JSON objects by using iterators rather than operator[]. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 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: 1. In a couple of cases, now reusing the same zstring so the cost of growing the string is not paid per value. 2. Added a string_appender class that chunks the appending of single characters onto the end of strings to reduce the number of times zstring::append() is called. 3. Improved creating of JSON objects by using iterators rather than operator[]. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 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. Commit Message changed to: 1. In a couple of cases, now reusing the same zstring so the cost of growing the string is not paid per value. 2. Added a string_appender class that chunks the appending of single characters onto the end of strings to reduce the number of times zstring::append() is called. 3. Improved creating of JSON objects by using iterators rather than operator[]. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 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/209760 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/209760 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 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
Voting criteria failed for the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 : Votes: {'Approve': 1} -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 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/209760 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 result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 Stage CommitZorba failed. Check console output at http://jenkins.zorba.io:8180/job/CommitZorba/303/console to view the results. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 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 succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 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/209760 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209760 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/209825 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: Maintaining more state to avoid construction/allocation/destruction of istringstream. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825 Maintaining more state to avoid construction/allocation/destruction of istringstream. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/api/mem_streambuf.cpp' --- src/api/mem_streambuf.cpp 2013-12-27 15:11:16 + +++ src/api/mem_streambuf.cpp 2014-03-07 02:12:46 + @@ -17,7 +17,6 @@ #include stdafx.h #include cstring /* for memcpy(3) */ -#include zorba/internal/cxx_util.h #include zorba/util/mem_streambuf.h #include diagnostics/assert.h === modified file 'src/runtime/csv/csv_impl.cpp' --- src/runtime/csv/csv_impl.cpp 2014-03-06 19:06:43 + +++ src/runtime/csv/csv_impl.cpp 2014-03-07 02:12:46 + @@ -157,11 +157,10 @@ return false; } -static json::type parse_json( zstring const s, json::token *ptoken ) { - mem_streambuf buf( (char*)s.data(), s.size() ); - istringstream iss; - iss.ios::rdbuf( buf ); - json::lexer lex( iss ); +static json::type parse_json( zstring const s, csv_parse_json_state state, + json::token *ptoken ) { + state.set_data( s.data(), s.size() ); + json::lexer lex( state.iss_ ); if ( !lex.next( ptoken, false ) ) return json::none; json::token::type const tt = ptoken-get_type(); @@ -221,9 +220,9 @@ state-csv_.set_stream( item-getStream() ); else { item-getStringValue2( state-string_ ); -state-mem_streambuf_.set( state-string_.data(), state-string_.size() ); -state-iss_.ios::rdbuf( state-mem_streambuf_ ); -state-csv_.set_stream( state-iss_ ); +state-input_buf_.set( state-string_.data(), state-string_.size() ); +state-input_iss_.ios::rdbuf( state-input_buf_ ); +state-csv_.set_stream( state-input_iss_ ); } } @@ -428,7 +427,7 @@ GENV_ITEMFACTORY-createBoolean( item, false ); else { json::token t; -switch ( parse_json( *value, t ) ) { +switch ( parse_json( *value, state-parse_json_state_, t ) ) { case json::boolean: GENV_ITEMFACTORY-createBoolean( item, (*value)[0] == 't' ); break; === modified file 'src/runtime/csv/csv_util.h' --- src/runtime/csv/csv_util.h 2013-08-23 00:43:04 + +++ src/runtime/csv/csv_util.h 2014-03-07 02:12:46 + @@ -17,10 +17,32 @@ #ifndef ZORBA_CSV_UTIL_H #define ZORBA_CSV_UTIL_H +// standard +#include sstream + +// Zorba +#include zorba/util/mem_streambuf.h + namespace zorba { /// +struct csv_parse_json_state { + std::istringstream iss_; + + csv_parse_json_state() { +iss_.std::ios::rdbuf( buf_ ); + } + + void set_data( char const *s, size_t size ) { +buf_.set( const_castchar*( s ), size ); +iss_.seekg( 0 ); + } + +private: + mem_streambuf buf_; +}; + namespace missing { enum type { null, === modified file 'src/runtime/csv/pregenerated/csv.h' --- src/runtime/csv/pregenerated/csv.h 2014-03-06 19:06:43 + +++ src/runtime/csv/pregenerated/csv.h 2014-03-07 02:12:46 + @@ -50,11 +50,12 @@ bool cast_unquoted_; // csv_parser csv_; // zstring extra_name_; // - std::istringstream iss_; // + mem_streambuf input_buf_; // + std::istringstream input_iss_; // std::vectorstore::Item_t keys_; // unsigned line_no_; // - mem_streambuf mem_streambuf_; // missing::type missing_; // + csv_parse_json_state parse_json_state_; // bool skip_called_; // zstring string_; // zstring value_; // === modified file 'src/runtime/spec/csv/csv.xml' --- src/runtime/spec/csv/csv.xml 2014-03-06 19:06:43 + +++ src/runtime/spec/csv/csv.xml 2014-03-07 02:12:46 + @@ -32,11 +32,12 @@ zorba:member type=bool name=cast_unquoted_ defaultValue=true/ zorba:member type=csv_parser name=csv_/ zorba:member type=zstring name=extra_name_/ -zorba:member type=std::istringstream name=iss_/ +zorba:member type=mem_streambuf name=input_buf_/ +zorba:member type=std::istringstream name=input_iss_/ zorba:member type=std::vectorlt;store::Item_tgt; name=keys_/ zorba:member type=unsigned name=line_no_ defaultValue=1/ -zorba:member type=mem_streambuf name=mem_streambuf_/ zorba:member type=missing::type name=missing_ defaultValue=missing::null/ +zorba:member type=csv_parse_json_state name=parse_json_state_/ zorba:member type=bool name=skip_called_ defaultValue=false/ zorba:member type=zstring name=string_/ zorba:member type=zstring name=value_/ -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe :
[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/209825 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825 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/209825 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825 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 result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825 Stage BuildZorbaUbuntu failed. Check compiler output at http://jenkins.zorba.io:8180/job/BuildZorbaUbuntu/540/parsed_console to view the results. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825 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 succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825 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/209825 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209825 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: More help message clean-up. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559 More help message clean-up. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'bin/zorbacmd_args.cpp' --- bin/zorbacmd_args.cpp 2014-03-04 03:22:16 + +++ bin/zorbacmd_args.cpp 2014-03-05 23:41:53 + @@ -78,30 +78,30 @@ // b // -HELP_OPT( --base-uri ) +HELP_OPT( --base-uri uri ) Set the base URI property of the static context.\n\n -HELP_OPT( --boundary-space ) - Set the boundary-space policy ('strip' or 'preserve') in the static context.\n\n +HELP_OPT( --boundary-space {strip|preserve} ) + Set the boundary-space policy in the static context.\n\n HELP_OPT( --byte-order-mark ) Set the byte-order-mark for the serializer.\n\n // c // -HELP_OPT( --classpath ) - JVM classpath to be used by modules using Java implementations\n\n +HELP_OPT( --classpath path ) + Set the JVM classpath to be used by modules using Java implementations.\n\n HELP_OPT( --compile-only ) Only compile (don't execute).\n\n -HELP_OPT( --compile-plan, ) +HELP_OPT( --compile-plan ) Do not execute the query; just compile it and save the execution plan in the file specified with the -o option.\n\n -HELP_OPT( --construction-mode ) - Set the construction mode ('strip' or 'preserve') in the static context.\n\n +HELP_OPT( --construction-mode {strip|preserve} ) + Set the construction mode in the static context.\n\n -HELP_OPT( --context-item ) +HELP_OPT( --context-item item ) Set the context item to the XML document in a given file.\n\n // d // @@ -111,21 +111,21 @@ Launch the Zorba debugger server and connect to a DBGP-enabled debugger client.\n\n #endif /* ZORBA_WITH_DEBUGGER */ -HELP_OPT( --debug-file ) +HELP_OPT( --debug-file file ) Sets the file to write developer debugging information to.\n\n -HELP_OPT( --debug-stream stream ) +HELP_OPT( --debug-stream {1|cout|stdout|2|cerr|stderr} ) Sets the stream to write developer debugging information to.\n\n #ifdef ZORBA_WITH_DEBUGGER -HELP_OPT( --debug-host, -h ) - The host where the DBGP-enabled debugger client listens for connections. Defaults to: 127.0.0.1\n\n +HELP_OPT( --debug-host, -h host ) + The host where the DBGP-enabled debugger client listens for connections; default: 127.0.0.1.\n\n -HELP_OPT( --debug-port, -p ) - The port on which the DBGP-enabled debugger client listens for connections. Defaults to: 28028\n\n +HELP_OPT( --debug-port, -p port ) + The port on which the DBGP-enabled debugger client listens for connections; defaults: 28028.\n\n #endif /* ZORBA_WITH_DEBUGGER */ -HELP_OPT( --default-collation ) +HELP_OPT( --default-collation collation ) Add the given collation and set the value of the default collation in the static context to the given collation.\n\n HELP_OPT( --disable-http-resolution ) @@ -139,8 +139,8 @@ HELP_OPT( --execute-plan ) Do not compile the query; instead load the execution plan from the file specified by the -f -q options (or by any file specified without any other argument), and execute the loaded plan.\n\n -HELP_OPT( --external-variable, -e ) - Provide the value for a variable given a file (name=file) or a value (name:=value)\n\n +HELP_OPT( --external-variable, -e name{=file|:=value} ) + Set the value for an externsl variable.\n\n // f // @@ -149,7 +149,7 @@ // h // -HELP_OPT( --help, -h ) +HELP_OPT( --help ) Print this help message.\n\n // i // @@ -163,8 +163,8 @@ HELP_OPT( --inline-udf ) Inline user-defined functions.\n\n -HELP_OPT( --iterator-tree format ) - Print the iterator tree in in one of DOT, JSON, or XML formats.\n\n +HELP_OPT( --iterator-tree {dot|json|xml} ) + Print the iterator tree in the given format.\n\n // j // @@ -176,7 +176,7 @@ HELP_OPT( --lib-module, -l ) Query compiler option to treat the query as a library module. If this is set --compile-only option is also set to true.\n\n -HELP_OPT( --lib-path ) +HELP_OPT(
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/209559 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/209559 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559 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/209559 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559 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 succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559 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/209559 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559 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/208935 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208935 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208935 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 succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208935 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/208935 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208935 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 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 succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 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/208907 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 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 help message. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208935 Fixed help message. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208935 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'bin/zorbacmd_args.cpp' --- bin/zorbacmd_args.cpp 2014-02-28 00:31:04 + +++ bin/zorbacmd_args.cpp 2014-03-01 15:35:13 + @@ -808,7 +808,7 @@ if ( !error ) error = check_args(); if ( error ) { -cout Error: error \nUse -h for help. endl; +cout Error: error \nUse --help for help. endl; exit( 1 ); } return argv - argv_orig; === modified file 'test/iterplans/apitest_args.cpp' --- test/iterplans/apitest_args.cpp 2014-02-21 14:58:32 + +++ test/iterplans/apitest_args.cpp 2014-03-01 15:35:13 + @@ -548,7 +548,7 @@ if ( !error ) error = check_args(); if ( error ) { -cout Error: error \nUse -h for help. endl; +cout Error: error \nUse --help for help. endl; exit( 1 ); } return argv - argv_orig; -- 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/208935 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208935 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/208935 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/208907 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 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/208907 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. Commit Message changed to: Discovered a bug where strings like street addresses, e.g., 870 Market Street, will cause an exception to be thrown due to the mis-guessing about what kind of JSON token a string really is. Fixed. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 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: Discovered a bug where strings like street addresses, e.g., 870 Market Street, will cause an exception to be thrown due to the mis-guessing about what kind of JSON token a string really is. Fixed. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208907 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/208907 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 assertion failure for (). 2. Added -n as a synonym for --trailing-nl. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 1. Fixed assertion failure for (). 2. Added -n as a synonym for --trailing-nl. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'bin/zorbacmd_args.cpp' --- bin/zorbacmd_args.cpp 2014-02-21 14:58:32 + +++ bin/zorbacmd_args.cpp 2014-02-28 00:38:00 + @@ -322,7 +322,7 @@ Trace the translator.\n\n #endif /* NDEBUG */ -HELP_OPT( --trailing-nl ) +HELP_OPT( --trailing-nl, -n ) Print a trailing newline after the result of the query.\n\n // u // @@ -771,7 +771,7 @@ else if ( IS_LONG_OPT( --trace-translator ) ) z_props.setTraceTranslator( true ); #endif /* NDEBUG */ -else if ( IS_LONG_OPT( --trailing-nl ) ) +else if ( IS_OPT( --trailing-nl, -n ) ) zc_props.trailing_nl_ = true; // u // === modified file 'src/runtime/csv/csv_impl.cpp' --- src/runtime/csv/csv_impl.cpp 2014-01-20 16:52:44 + +++ src/runtime/csv/csv_impl.cpp 2014-02-28 00:38:00 + @@ -589,7 +589,8 @@ while ( i-next( item ) ) state-keys_.push_back( item ); i-close(); -} +} else + goto end; // empty sequence: we're done } if ( do_header ) { @@ -601,9 +602,11 @@ separator = true; line += (*key)-getStringValue(); } -line += \r\n; -GENV_ITEMFACTORY-createString( result, line ); -STACK_PUSH( true, state ); +if ( !line.empty() ) { + line += \r\n; + GENV_ITEMFACTORY-createString( result, line ); + STACK_PUSH( true, state ); +} } if ( !state-header_item_.isNull() ) { @@ -655,6 +658,8 @@ GENV_ITEMFACTORY-createString( result, line ); STACK_PUSH( true, state ); } // while + +end: STACK_END( state ); } -- 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: 1. Fixed assertion failure for (). 2. Fixed state reset bug. 2. Added -n as a synonym for --trailing-nl. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 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. Commit Message changed to: 1. Fixed assertion failure for (). 2. Fixed state reset bug. 3. Added -n as a synonym for --trailing-nl. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 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. Commit Message changed to: 1. Fixed assertion failure for (). 2. Fixed state reset bug. 2. Added -n as a synonym for --trailing-nl. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 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: 1. Fixed assertion failure for (). 2. Fixed state reset bug. 3. Added -n as a synonym for --trailing-nl. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 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/208711 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/208711 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 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/208711 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 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/208711 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 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 succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208711 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 the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355 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 succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355 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/207355 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355 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