Merge lp:~zorba-coders/zorba/jsoniq-error-code-fixes into lp:zorba
Proposed by
Till Westmann
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Till Westmann | ||||||||
Approved revision: | 11062 | ||||||||
Merged at revision: | 11064 | ||||||||
Proposed branch: | lp:~zorba-coders/zorba/jsoniq-error-code-fixes | ||||||||
Merge into: | lp:zorba | ||||||||
Diff against target: |
359 lines (+51/-67) 19 files modified
include/zorba/pregenerated/diagnostic_list.h (+5/-7) modules/org/jsoniq/www/functions.xq (+4/-4) modules/org/jsoniq/www/pregenerated/errors.xq (+3/-8) src/diagnostics/diagnostic_en.xml (+3/-10) src/diagnostics/pregenerated/diagnostic_list.cpp (+7/-10) src/diagnostics/pregenerated/dict_en.cpp (+9/-12) src/runtime/json/jsoniq_functions_impl.cpp (+4/-4) src/store/naive/json_items.cpp (+2/-2) src/store/naive/json_loader.cpp (+4/-4) test/rbkt/Queries/zorba/jsoniq/parse_json-02.spec (+1/-1) test/rbkt/Queries/zorba/jsoniq/parse_json-02.xq (+1/-1) test/rbkt/Queries/zorba/jsoniq/parse_json-03.spec (+1/-1) test/rbkt/Queries/zorba/jsoniq/parse_json-03.xq (+1/-1) test/rbkt/Queries/zorba/jsoniq/parse_json-04.spec (+1/-1) test/rbkt/Queries/zorba/jsoniq/parse_json-04.xq (+1/-1) test/rbkt/Queries/zorba/jsoniq/parse_json-07.spec (+1/-0) test/rbkt/Queries/zorba/jsoniq/parse_json-07.xq (+1/-0) test/rbkt/Queries/zorba/jsoniq/parse_json-08.spec (+1/-0) test/rbkt/Queries/zorba/jsoniq/parse_json-08.xq (+1/-0) |
||||||||
To merge this branch: | bzr merge lp:~zorba-coders/zorba/jsoniq-error-code-fixes | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ghislain Fourny | Approve | ||
Till Westmann | Approve | ||
Review via email: mp+126060@code.launchpad.net |
Commit message
s/JNTY0003/
s/JSDY0020/
s/JSDY0021/
removed JSDY0040
doc fixes for jn:parse-json
Description of the change
s/JNTY0003/
s/JSDY0020/
s/JSDY0021/
removed JSDY0040
doc fixes for jn:parse-json
To post a comment you must log in.
Validation queue starting for merge proposal. zorbatest. lambda. nu:8080/ remotequeue/ jsoniq- error-code- fixes-2012- 09-24T17- 47-49.386Z/ log.html
Log at: http://