lp:~zorba-coders/zorba/947627

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:zorba at revision 10788

Markos Zaharioudakis: Approve on 2012-04-23

Till Westmann: Approve on 2012-03-20

Diff: 312 lines (+89/-21)

14 files modified

ChangeLog (+2/-0)
include/zorba/pregenerated/diagnostic_list.h (+2/-0)
modules/w3c/pregenerated/xqt-errors.xq (+8/-0)
src/api/staticcontextimpl.cpp (+2/-2)
src/compiler/translator/translator.cpp (+1/-1)
src/context/root_static_context.cpp (+1/-2)
src/context/static_context.cpp (+11/-6)
src/context/static_context.h (+1/-1)
src/diagnostics/diagnostic_en.xml (+7/-0)
src/diagnostics/pregenerated/diagnostic_list.cpp (+3/-0)
src/diagnostics/pregenerated/dict_en.cpp (+1/-0)
test/rbkt/Queries/zorba/misc/context-item-decl01.spec (+1/-0)
test/rbkt/Queries/zorba/misc/context-item-decl01.xq (+5/-0)
test/unit/context_item.cpp (+44/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #947627: setting the static type of the context item is ignored

Undecided

Fix Released

Link a bug report

Related blueprints

10725. By Markos Zaharioudakis on 2012-04-23

merge from trunk

10724. By Markos Zaharioudakis on 2012-04-23

inner context item declaration hides an outer one

10723. By Matthias Brantner on 2012-03-15

update changelog

10722. By Matthias Brantner on 2012-03-15

fixed bug #947627 (setting the static type of the context item is ignored) + raise err:XQST0099 if the context item is set twice

10721. By Rodolfo Ochoa on 2012-03-14

- Fixed bug for PHP wrapper pointing to a wrong DLL name
- Fixed precompiled headers bug
- Fixed warning -> Conversion Int to Bool - Performance warning Approved: Cezar Andrei, William Candillon, Matthias Brantner

10720. By Matthias Brantner on 2012-03-14

2.2 release preparations Approved: Chris Hillery, Matthias Brantner

10719. By Ghislain Fourny on 2012-03-13

Introduced function OrdPathNode::getDescendantNodeByOrdPath (from Sausalito). Approved: Markos Zaharioudakis, Matthias Brantner

10718. By Markos Zaharioudakis on 2012-03-13

Fixed bug #948259 Approved: Markos Zaharioudakis

10717. By Rodolfo Ochoa on 2012-03-12

This fixes the error:
n strings remain in the pool.
and change it to a more comprehensive error with reference to document that helps to prevent the error. Approved: Matthias Brantner, Markos Zaharioudakis, Cezar Andrei

10716. By Matthias Brantner on 2012-03-12

Fixed bug #952829 (Nondeterministic annotation doesn't seem to be checked) Approved: Matthias Brantner, William Candillon