Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

[Paul J. Lucas]

Misc fixes.

Misc fixes.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/201083

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/201083

Stage "TestZorbaUbuntu" failed.
22 tests failed (8752 total tests run).

Check test results at http://jenkins.lambda.nu:8180/job/TestZorbaUbuntu/429/testReport/ to view the results.

[lp:~paul-lucas/zorba/pjl-misc]

11400. By Paul J. Lucas on 2014-01-10

Now checking command-line argument count.

11401. By Paul J. Lucas on 2014-01-10

Now using auto_attach.

11402. By Paul J. Lucas on 2014-01-10

Work-around for stream bug.

11403. By Paul J. Lucas on 2014-01-10

Added vim lines.

11404. By Paul J. Lucas on 2014-01-10

Fixed getObjectValue().

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/201083

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'include/zorba/item.h'
--- include/zorba/item.h	2013-09-26 07:38:44 +0000
+++ include/zorba/item.h	2014-01-10 02:11:36 +0000
@@ -418,7 +418,7 @@
    * @throw ZorbaException if an error occured (e.g. the Item is not of type JSON Object).
    */
   Item
-  getObjectValue(String aName) const;
+  getObjectValue(String const &aName) const;
 
   /**
    * Checks whether the item's content is streamable.
 
=== modified file 'include/zorba/util/base64_stream.h'
--- include/zorba/util/base64_stream.h	2013-08-05 22:23:16 +0000
+++ include/zorba/util/base64_stream.h	2014-01-10 02:11:36 +0000
@@ -104,7 +104,7 @@
   std::streamsize xsputn( char_type const*, std::streamsize );
 
 private:
-  std::streambuf *orig_buf_;
+  std::streambuf *const orig_buf_;
 
   char gbuf_[3];
   char pbuf_[3];
@@ -269,11 +269,10 @@
    * @param stream The stream to attach the base64::streambuf to.  If the
    * stream already has a base64::streambuf attached to it, this contructor
    * does nothing.
-   * @param charset The name of the character encoding to convert from/to.
    * @return \c true only if a base64::streambuf was attached.
    */
-  bool attach( StreamType &stream, char const *charset ) {
-    if ( base64::attach( stream, charset ) ) {
+  bool attach( StreamType &stream ) {
+    if ( base64::attach( stream ) ) {
       stream_ = &stream;
       return true;
     }
@@ -311,6 +310,9 @@
 public:
   /**
    * Constructs a %base64::stream.
+   *
+   * Do not use this constructor when StreamType is std::ostream; see
+   * http://llvm.org/bugs/show_bug.cgi?id=15337
    */
   stream() :
 #ifdef WIN32
 
=== modified file 'include/zorba/util/hexbinary_stream.h'
--- include/zorba/util/hexbinary_stream.h	2013-08-05 22:23:16 +0000
+++ include/zorba/util/hexbinary_stream.h	2014-01-10 02:11:36 +0000
@@ -94,7 +94,7 @@
   std::streamsize xsputn( char_type const*, std::streamsize );
 
 private:
-  std::streambuf *orig_buf_;
+  std::streambuf *const orig_buf_;
   char gbuf_[2];
 
   void clear();
@@ -294,6 +294,9 @@
 public:
   /**
    * Constructs a %hexbinary::stream.
+   *
+   * Do not use this constructor when StreamType is std::ostream; see
+   * http://llvm.org/bugs/show_bug.cgi?id=15337
    */
   stream() :
 #ifdef WIN32
 
=== modified file 'modules/http-client/json/http-client.xq.src/http_client.cpp'
--- modules/http-client/json/http-client.xq.src/http_client.cpp	2013-09-17 21:12:49 +0000
+++ modules/http-client/json/http-client.xq.src/http_client.cpp	2014-01-10 02:11:36 +0000
@@ -254,3 +254,4 @@
   return new zorba::http_client::HttpClientModule();
 }
 
+/* vim:set et sw=2 ts=2: */
 
=== modified file 'modules/http-client/json/http-client.xq.src/http_request_handler.cpp'
--- modules/http-client/json/http-client.xq.src/http_request_handler.cpp	2013-08-02 14:55:29 +0000
+++ modules/http-client/json/http-client.xq.src/http_request_handler.cpp	2014-01-10 02:11:36 +0000
@@ -293,13 +293,10 @@
   void HttpRequestHandler::emitStreamableBase64Binary(Item aItem)
   {
     std::istream& stream = aItem.getStream();
-    bool lDecoderAttached = false;
+    base64::auto_attach<std::istream> b64_aa;
 
     if (aItem.isEncoded())
-    {
-      base64::attach(stream);
-      lDecoderAttached = true;
-    }
+      b64_aa.attach(stream);
 
     char buf[1024];
     while (!stream.eof())
@@ -307,9 +304,6 @@
       stream.read(buf, 1024);
       theSerStream->write(buf, stream.gcount());
     }
-
-    if (lDecoderAttached)
-      base64::detach(stream);
   }
 
   void HttpRequestHandler::emitBase64Binary(Item aItem)
@@ -329,13 +323,10 @@
   void HttpRequestHandler::emitStreamableHexBinary(Item aItem)
     {
       std::istream& stream = aItem.getStream();
-      bool lDecoderAttached = false;
+      hexbinary::auto_attach<std::istream> hex_aa;
 
       if (aItem.isEncoded())
-      {
-        hexbinary::attach(stream);
-        lDecoderAttached = true;
-      }
+        hex_aa.attach(stream);
 
       char buf[1024];
       while (!stream.eof())
@@ -343,9 +334,6 @@
         stream.read(buf, 1024);
         theSerStream->write(buf, stream.gcount());
       }
-
-      if (lDecoderAttached)
-        hexbinary::detach(stream);
     }
 
     void HttpRequestHandler::emitHexBinary(Item aItem)
 
=== modified file 'modules/http-client/json/http-client.xq.src/http_request_handler.h'
--- modules/http-client/json/http-client.xq.src/http_request_handler.h	2013-07-19 17:36:52 +0000
+++ modules/http-client/json/http-client.xq.src/http_request_handler.h	2014-01-10 02:11:36 +0000
@@ -117,3 +117,4 @@
 }}
 
 #endif //HTTP_REQUEST_HANDLER_H
+/* vim:set et sw=2 ts=2: */
 
=== modified file 'modules/http-client/json/http-client.xq.src/http_response_handler.cpp'
--- modules/http-client/json/http-client.xq.src/http_response_handler.cpp	2013-06-14 16:32:01 +0000
+++ modules/http-client/json/http-client.xq.src/http_response_handler.cpp	2014-01-10 02:11:36 +0000
@@ -292,3 +292,4 @@
     return theResult;
   }
 }} //namespace zorba, namespace http_client
+/* vim:set et sw=2 ts=2: */
 
=== modified file 'modules/http-client/json/http-client.xq.src/http_response_handler.h'
--- modules/http-client/json/http-client.xq.src/http_response_handler.h	2013-07-19 17:36:52 +0000
+++ modules/http-client/json/http-client.xq.src/http_response_handler.h	2014-01-10 02:11:36 +0000
@@ -124,3 +124,4 @@
 }} //namespace zorba, namespace http_client
 
 #endif //HTTP_RESPONSE_HANDLER_H
+/* vim:set et sw=2 ts=2: */
 
=== modified file 'modules/http-client/json/http-client.xq.src/http_response_parser.h'
--- modules/http-client/json/http-client.xq.src/http_response_parser.h	2013-07-19 17:36:52 +0000
+++ modules/http-client/json/http-client.xq.src/http_response_parser.h	2014-01-10 02:11:36 +0000
@@ -91,3 +91,4 @@
 } // namespace zorba
 
 #endif //HTTP_RESPONSE_PARSER_H
+/* vim:set et sw=2 ts=2: */
 
=== modified file 'modules/http-client/json/http-client.xq.src/inform_data_read.cpp'
--- modules/http-client/json/http-client.xq.src/inform_data_read.cpp	2013-06-14 16:32:01 +0000
+++ modules/http-client/json/http-client.xq.src/inform_data_read.cpp	2014-01-10 02:11:36 +0000
@@ -20,3 +20,4 @@
   {
   }
 }} //namespace zorba, http_client
+/* vim:set et sw=2 ts=2: */
 
=== modified file 'modules/http-client/json/http-client.xq.src/inform_data_read.h'
--- modules/http-client/json/http-client.xq.src/inform_data_read.h	2013-06-14 16:32:01 +0000
+++ modules/http-client/json/http-client.xq.src/inform_data_read.h	2014-01-10 02:11:36 +0000
@@ -25,3 +25,4 @@
   };
 }} //namespace zorba, http_client
 #endif //INFORM_DATA_READ_H
+/* vim:set et sw=2 ts=2: */
 
=== modified file 'modules/http-client/json/http-client.xq.src/request_parser.cpp'
--- modules/http-client/json/http-client.xq.src/request_parser.cpp	2013-09-17 21:12:49 +0000
+++ modules/http-client/json/http-client.xq.src/request_parser.cpp	2014-01-10 02:11:36 +0000
@@ -352,3 +352,4 @@
 
 }
 }
+/* vim:set et sw=2 ts=2: */
 
=== modified file 'modules/http-client/json/http-client.xq.src/request_parser.h'
--- modules/http-client/json/http-client.xq.src/request_parser.h	2013-07-19 17:36:52 +0000
+++ modules/http-client/json/http-client.xq.src/request_parser.h	2014-01-10 02:11:36 +0000
@@ -61,3 +61,4 @@
 } //namespace http_request
 
 #endif // REQUEST_PARSER_H
+/* vim:set et sw=2 ts=2: */
 
=== modified file 'src/api/item.cpp'
--- src/api/item.cpp	2013-08-01 17:38:35 +0000
+++ src/api/item.cpp	2014-01-10 02:11:36 +0000
@@ -534,14 +534,15 @@
 
 
 Item
-Item::getObjectValue(String aName) const
+Item::getObjectValue(String const &aName) const
 {
+  String lName( aName ); // copy needed because createString() is destructive
   ITEM_TRY
     SYNC_CODE(AutoLock lock(GENV_STORE.getGlobalLock(), Lock::READ);)
-    zstring& lName = Unmarshaller::getInternalString(aName);
+    zstring& liName = Unmarshaller::getInternalString(lName);
     
     store::Item_t lStringItem;
-    GENV_ITEMFACTORY->createString(lStringItem, lName);
+    GENV_ITEMFACTORY->createString(lStringItem, liName);
   
     return m_item->getObjectValue(lStringItem).getp();
 
 
=== modified file 'src/diagnostics/dict.cpp'
--- src/diagnostics/dict.cpp	2013-08-02 18:34:59 +0000
+++ src/diagnostics/dict.cpp	2014-01-10 02:11:36 +0000
@@ -68,9 +68,15 @@
 
 char const* lookup( char const *key ) {
   typedef pair<entry const*,entry const*> range_type;
+  //
+  // It's possible an exception was thrown after shutdown has already started
+  // in which case the GlobalEnvironment no longer exists.
+  //
+  GlobalEnvironment const *const genv = GENV_PTR;
+  iso639_1::type lang = genv ? genv->get_host_lang() : locale::get_host_lang();
 
   static entry const *begin, *end;
-  if ( !begin && !get_dict( GENV.get_host_lang(), &begin, &end ) )
+  if ( !begin && !get_dict( lang, &begin, &end ) )
     SET_DICT( en, begin, end );
 
   entry entry_to_find;
 
=== modified file 'src/system/globalenv.h'
--- src/system/globalenv.h	2013-09-24 09:48:50 +0000
+++ src/system/globalenv.h	2014-01-10 02:11:36 +0000
@@ -102,6 +102,11 @@
     return *m_globalEnv;
   }
 
+  static GlobalEnvironment* getInstancePtr()
+  {
+    return m_globalEnv;
+  }
+
 public:
   ~GlobalEnvironment();
 
@@ -151,6 +156,7 @@
 
 
 #define GENV GlobalEnvironment::getInstance()
+#define GENV_PTR GlobalEnvironment::getInstancePtr()
 
 #define GENV_TYPESYSTEM GlobalEnvironment::getInstance().getRootTypeManager()
 
 
=== modified file 'src/unit_tests/test_base64_streambuf.cpp'
--- src/unit_tests/test_base64_streambuf.cpp	2013-06-11 23:38:49 +0000
+++ src/unit_tests/test_base64_streambuf.cpp	2014-01-10 02:11:36 +0000
@@ -100,6 +100,13 @@
   return b64_str == expected_b64_str;
 }
 
+static void test_instantiate() {
+  base64::auto_attach<ostream> aa_os;
+  (void)aa_os;
+  base64::stream<ostringstream> b64_os;
+  (void)b64_os;
+}
+
 static bool test_put( test const *t ) {
   ostringstream oss;
   { // local scope
@@ -128,6 +135,8 @@
 namespace UnitTests {
 
 int test_base64_streambuf( int, char*[] ) {
+  test_instantiate();
+
   int test_no = 0;
   for ( test const *t = tests; t->raw_str; ++t, ++test_no ) {
     ASSERT_TRUE_AND_NO_EXCEPTION( test_no, test_getline( t ) );
 
=== modified file 'src/unit_tests/test_hexbinary_streambuf.cpp'
--- src/unit_tests/test_hexbinary_streambuf.cpp	2013-06-20 00:53:29 +0000
+++ src/unit_tests/test_hexbinary_streambuf.cpp	2014-01-10 02:11:36 +0000
@@ -100,6 +100,13 @@
   return hb_str == expected_hb_str;
 }
 
+static void test_instantiate() {
+  hexbinary::auto_attach<ostream> aa_os;
+  (void)aa_os;
+  hexbinary::stream<ostringstream> hb_os;
+  (void)hb_os;
+}
+
 static bool test_put( test const *t ) {
   ostringstream oss;
   { // local scope
@@ -126,6 +133,8 @@
 namespace UnitTests {
 
 int test_hexbinary_streambuf( int, char*[] ) {
+  test_instantiate();
+
   int test_no = 0;
   for ( test const *t = tests; t->raw_str; ++t, ++test_no ) {
     ASSERT_TRUE_AND_NO_EXCEPTION( test_no, test_getline( t ) );
 
=== modified file 'test/unit/lib_unit_test.cpp'
--- test/unit/lib_unit_test.cpp	2013-06-12 13:19:13 +0000
+++ test/unit/lib_unit_test.cpp	2014-01-10 02:11:36 +0000
@@ -19,15 +19,20 @@
 #include <zorba/store_manager.h>
 #include <zorba/internal/unit_tests.h>
 
+using namespace std;
+using namespace zorba;
+
 /**
  * This is the main entry point for unit tests that require a running
  * Zorba instance and execute inside of libzorba.
  */
-
-using namespace zorba;
-
 int main(int argc, char* argv[])
 {
+  if ( argc != 2 ) {
+    cerr << "usage: " << argv[0] << " test-name" << endl;
+    return 1;
+  }
+
   void* lStore = zorba::StoreManager::getStore();
   Zorba* lZorba = Zorba::getInstance(lStore);