lp:~zorba-coders/zorba/bug-1044260

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:zorba at revision 11133

Matthias Brantner: Approve on 2012-11-26

Markos Zaharioudakis: Approve on 2012-11-26

Paul J. Lucas: Approve on 2012-11-25

Diff: 1826 lines (+769/-163)

31 files modified

include/zorba/internal/diagnostic.h (+6/-5)
include/zorba/pregenerated/diagnostic_list.h (+2/-0)
modules/org/jsoniq/www/pregenerated/errors.xq (+8/-0)
src/compiler/translator/translator.cpp (+5/-5)
src/context/static_context.cpp (+1/-1)
src/diagnostics/CMakeLists.txt (+16/-5)
src/diagnostics/diagnostic.h (+31/-5)
src/diagnostics/diagnostic_en.xml (+102/-33)
src/diagnostics/dict.h (+3/-1)
src/diagnostics/dict_zed_keys_h.xq (+55/-0)
src/diagnostics/pregenerated/diagnostic_list.cpp (+3/-0)
src/diagnostics/pregenerated/dict_en.cpp (+45/-37)
src/diagnostics/pregenerated/dict_zed_keys.h (+338/-0)
src/runtime/core/apply_updates.cpp (+35/-19)
src/runtime/core/fncall_iterator.cpp (+1/-1)
src/runtime/core/sequencetypes.cpp (+7/-8)
src/runtime/function_item/dynamic_fncall_iterator.cpp (+3/-3)
src/runtime/json/jsoniq_functions_impl.cpp (+2/-2)
src/runtime/numerics/numerics_impl.cpp (+1/-1)
src/store/naive/node_items.cpp (+2/-1)
src/store/naive/pul_primitives.cpp (+59/-26)
src/store/naive/store.cpp (+1/-1)
src/util/error_util.cpp (+2/-2)
src/util/fs_util.h (+31/-0)
test/rbkt/ExpQueryResults/zorba/index/auctions2u.xml.res (+1/-1)
test/rbkt/ExpQueryResults/zorba/index/undo1.xml.res (+1/-1)
test/rbkt/ExpQueryResults/zorba/jsoniq/obj_constr_06.xml.res (+1/-1)
test/rbkt/ExpQueryResults/zorba/jsoniq/obj_constr_10.xml.res (+1/-1)
test/rbkt/ExpQueryResults/zorba/jsoniq/serializer-JNSE0022.xml.res (+1/-1)
test/rbkt/Queries/zorba/index/auctions2u.xq (+1/-1)
test/rbkt/Queries/zorba/index/undo1.xq (+4/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1044245: Assertion failed: (result.first != result.second)	High	Fix Released
Bug #1044260: Need way to test code for undefined diagnostic keys	Medium	Fix Released
Bug #1052283: XUDY0021_AppliedAt used without definition	High	Fix Released
Bug #1052476: JNUP0019 misused	High	Fix Released

Link a bug report

Related blueprints

11080. By Paul J. Lucas on 2012-11-26

Now only putting file name in error.

11079. By Markos Zaharioudakis on 2012-11-26

fixed failing test

11078. By Paul J. Lucas on 2012-11-25

Added base_name().

11077. By Paul J. Lucas on 2012-11-24

Now keeping the original error code.

11076. By Paul J. Lucas on 2012-11-24

Merge from trunk.

11075. By Markos Zaharioudakis on 2012-11-21

1. added some error codes to be reprocessed inside the catch statement in apply_updates.cpp. 2. Added location to errors thrown from pul_primitives.cpp

11074. By Paul J. Lucas on 2012-11-20

Merge from trunk.

11073. By Paul J. Lucas on 2012-11-17

Added error codes to "catch" clause.

11072. By Paul J. Lucas on 2012-11-17

Fixed comment.

11071. By Paul J. Lucas on 2012-11-17

1. Added line_end and column_end to a variant of make_location.
2. Added make_location(XQueryException const&).