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

[Paul J. Lucas]

Removed wrong assert() for invalid XML.

Removed wrong assert() for invalid XML.

[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/180658

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/180658

Stage "TestZorbaUbuntu" failed.
1 tests failed (8403 total tests run).

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

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

11321. By Paul J. Lucas on 2013-08-16

Fix.

[Zorba Build Bot (zorba-buildbot)]

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

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'src/runtime/json/snelson.cpp'
--- src/runtime/json/snelson.cpp	2013-07-29 23:55:03 +0000
+++ src/runtime/json/snelson.cpp	2013-08-16 22:10:59 +0000
@@ -290,8 +290,6 @@
       parent_type = "array";
     else if ( ::strcmp( required_name, "pair" ) == 0 )
       parent_type = "object";
-    else
-      ZORBA_ASSERT( false );
     throw XQUERY_EXCEPTION(
       zerr::ZJSE0004_BAD_NODE,
       ERROR_PARAMS( element_name, parent_type, required_name )

=== added file 'test/rbkt/Queries/zorba/json/json-snelson-x2j-array-13.spec'
--- test/rbkt/Queries/zorba/json/json-snelson-x2j-array-13.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/json/json-snelson-x2j-array-13.spec	2013-08-16 22:10:59 +0000
@@ -0,0 +1,1 @@
+Error: http://zorba.io/errors:ZJSE0004

=== added file 'test/rbkt/Queries/zorba/json/json-snelson-x2j-array-13.xq'
--- test/rbkt/Queries/zorba/json/json-snelson-x2j-array-13.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/json/json-snelson-x2j-array-13.xq	2013-08-16 22:10:59 +0000
@@ -0,0 +1,6 @@
+import module namespace jx = "http://zorba.io/modules/json-xml";
+
+let $xml := <message type="array">Hello, world!</message>
+return jx:xml-to-json( $xml )
+
+(: vim:set et sw=2 ts=2: :)