Merge lp:~nbrinza/zorba/error-messages into lp:zorba
Proposed by
Nicolae Brinza
Status: | Merged | ||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Chris Hillery | ||||||||||||||||||||||||||||||||||||
Approved revision: | 10847 | ||||||||||||||||||||||||||||||||||||
Merged at revision: | 11174 | ||||||||||||||||||||||||||||||||||||
Proposed branch: | lp:~nbrinza/zorba/error-messages | ||||||||||||||||||||||||||||||||||||
Merge into: | lp:zorba | ||||||||||||||||||||||||||||||||||||
Diff against target: |
274 lines (+87/-41) 8 files modified
ChangeLog (+1/-0) src/compiler/parser/symbol_table.cpp (+22/-12) src/compiler/parser/symbol_table.h (+26/-22) src/compiler/parser/xquery_parser.cpp (+8/-3) src/compiler/parser/xquery_parser.y (+8/-3) test/rbkt/ExpQueryResults/zorba/parser/syntax-errors/unexpected-qname-03.xml.res (+1/-0) test/rbkt/Queries/zorba/parser/syntax-errors/missing-comma-02.xq (+1/-1) test/rbkt/Queries/zorba/parser/syntax-errors/unexpected-qname-03.xq (+20/-0) |
||||||||||||||||||||||||||||||||||||
To merge this branch: | bzr merge lp:~nbrinza/zorba/error-messages | ||||||||||||||||||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Hillery | Approve | ||
Nicolae Brinza | Approve | ||
Review via email: mp+142697@code.launchpad.net |
Commit message
Parser error messages contain the actual offending QName.
Description of the change
Parser error messages contain the actual offending QName.
To post a comment you must log in.
Validation queue starting for merge proposal. zorbatest. lambda. nu:8080/ remotequeue/ error-messages- 2013-01- 10T14-11- 42.339Z/ log.html
Log at: http://