Merge lp:~zorba-coders/zorba/947627 into lp:zorba
Proposed by
Matthias Brantner
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Markos Zaharioudakis | ||||
Approved revision: | 10725 | ||||
Merged at revision: | 10788 | ||||
Proposed branch: | lp:~zorba-coders/zorba/947627 | ||||
Merge into: | lp:zorba | ||||
Diff against target: |
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) |
||||
To merge this branch: | bzr merge lp:~zorba-coders/zorba/947627 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Markos Zaharioudakis | Approve | ||
Till Westmann | Approve | ||
Review via email: mp+97570@code.launchpad.net |
Commit message
fixed bug #947627 (setting the static type of the context item is ignored)
Description of the change
fixed bug #947627 (setting the static type of the context item is ignored)
- raise an error if specified twice in the prolog
- if set using the C++ api and later in the prolog
To post a comment you must log in.
Validation queue starting for merge proposal. zorbatest. lambda. nu:8080/ remotequeue/ 947627- 2012-03- 15T04-24- 34.805Z/ log.html
Log at: http://