Merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba

Proposed by Matthias Brantner on 2011-11-28
Status: Superseded
Proposed branch: lp:~matthias-brantner/zorba/bug-fixing
Merge into: lp:zorba
Diff against target: 41 lines (+3/-16)
2 files modified
ChangeLog (+1/-0)
src/compiler/translator/translator.cpp (+2/-16)
To merge this branch: bzr merge lp:~matthias-brantner/zorba/bug-fixing
Reviewer Review Type Date Requested Status
Matthias Brantner Approve on 2011-11-28
William Candillon 2011-11-28 Pending
Review via email: mp+83677@code.launchpad.net

This proposal has been superseded by a proposal from 2011-11-28.

Commit message

do not raise warnings for unknown annotations in unknown namespaces

Description of the change

- Do not raise warnings for unknown annotations in unknown namespaces
- Improved error message for wrong annotations

To post a comment you must log in.
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

10557. By Markos Zaharioudakis on 2011-11-29

fixed a performance bug in the implementation of groupby: no node copying for non-groupby vars Approved: Matthias Brantner, Markos Zaharioudakis

10558. By Sorin Marian Nasoi on 2011-11-29

Fix for bug #897619. Approved: Markos Zaharioudakis, Sorin Marian Nasoi

10559. By Sorin Marian Nasoi on 2011-11-29

Fix for bug #897616. Approved: Nicolae Brinza, Sorin Marian Nasoi

10560. By Matthias Brantner on 2011-11-29

Do not raise warnings for unknown annotations in unknown namespaces Approved: Nicolae Brinza, William Candillon, Matthias Brantner

10561. By Juan Zacarias on 2011-11-30

API changes
Removed isBoundExternalVariable from xquery.h
Added 2 functions to dynamic_context.h
isBoundContextItem and isBoundExternalVariable Approved: Matthias Brantner, Markos Zaharioudakis

10562. By Daniel Turcanu on 2011-11-30

fn:analyze-string fix
also, adding config.h include to ensure correct error messages Approved: Chris Hillery, Matthias Brantner

10563. By Matthias Brantner on 2011-11-30

fix for building modules outside of Zorba Approved: Chris Hillery, Matthias Brantner

10564. By William Candillon on 2011-11-30

Fix bug #897825 Approved: Rodolfo Ochoa, Matthias Brantner

10565. By Matthias Brantner on 2011-11-30

Unmarked XQueryX fn-put-005-fail as expected to fail in CMake. Approved: Chris Hillery, Matthias Brantner

10566. By Chris Hillery on 2011-11-30

Update ExternalModules.conf to download modules tagged 'zorba-2.1'. Approved: Matthias Brantner, Chris Hillery

10567. By Chris Hillery on 2011-12-01

fix for installing and using modules on windows Approved: Chris Hillery, Matthias Brantner

10568. By Chris Hillery on 2011-12-01

Separate check_uris into check_core_uris and check_uris. zorbacmd depends on check_core_uris, so non-core modules may depend on zorbacmd and be assured that the Zorba executable is fully functional. Approved: Matthias Brantner, Chris Hillery

10569. By Chris Hillery on 2011-12-01

Fix reversed URI installation directories. Approved: Matthias Brantner, Chris Hillery

10570. By Matthias Brantner on 2011-12-02

fix for bug #898064 Approved: Nicolae Brinza, William Candillon

10571. By Markos Zaharioudakis on 2011-12-05

small optimization of the group by Approved: Markos Zaharioudakis

10572. By Matthias Brantner on 2011-12-05

made destructors of Item subclasses virtual Approved: Markos Zaharioudakis, Matthias Brantner

10573. By Matthias Brantner on 2011-12-05

optimization: only have exactly two instances of boolean items in the simple store Approved: Markos Zaharioudakis, Matthias Brantner

10574. By Chris Hillery on 2011-12-05

Only create check_core_uris and associated dependencies if there are any core URIs (to prevent creating this target in standalone module projects).
 Approved: Juan Zacarias, Chris Hillery

10575. By Paul J. Lucas on 2011-12-06

undo previous changes and mark bug as expected to fail. Approved: Paul J. Lucas, Matthias Brantner

10576. By Paul J. Lucas on 2011-12-06

Things should be reverted now. Approved: Matthias Brantner, Paul J. Lucas

10577. By Matthias Brantner on 2011-12-07

fix build on windows Approved: Juan Zacarias, Matthias Brantner

10578. By Paul J. Lucas on 2011-12-08

Fixed build. Approved: Matthias Brantner, Paul J. Lucas

10579. By Matthias Brantner on 2011-12-09

exclude .bzr dir from source packages Approved: Cezar Andrei, Matthias Brantner

10580. By Markos Zaharioudakis on 2011-12-09

Cleaned up unused stuff in debugger_expr Approved: Gabriel Petrovay, Markos Zaharioudakis

10581. By Matthias Brantner on 2011-12-12

removed obsolete code guarded by the USE_POS macro Approved: Markos Zaharioudakis, Matthias Brantner

10582. By Matthias Brantner on 2011-12-13

- automatic caching of recursive, non-sequential, and deterministic functions with atomic parameter and return types
- %ann:cache and %ann:no-cache for controlling function result caching Approved: Markos Zaharioudakis, Matthias Brantner

10583. By Markos Zaharioudakis on 2011-12-14

Optimized and cleaned up SimpleTempSeq implementation and its usage. Approved: Markos Zaharioudakis

10584. By Paul J. Lucas on 2011-12-15

Applied William's patch; patched William's patch to handle UTF-8 properly. Approved: William Candillon, Paul J. Lucas

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2011-11-23 22:25:05 +0000
3+++ ChangeLog 2011-11-28 19:49:25 +0000
4@@ -38,6 +38,7 @@
5 * Fixed bug #3290122 (ZDST0003 needs collection name)
6 * Fixed bug #3406272 (merging of adjacent text nodes must be done after all
7 updates have been applied).
8+ * Don't raise warnings for unknown annotations.
9 * Fixed bug #3409344 (during detach, if the node being detached is the root of
10 its tree, it should be detached from the tree as well; otherwise memory
11 corruption will occur)
12
13=== modified file 'src/compiler/translator/translator.cpp'
14--- src/compiler/translator/translator.cpp 2011-11-24 10:18:51 +0000
15+++ src/compiler/translator/translator.cpp 2011-11-28 19:49:25 +0000
16@@ -3811,24 +3811,10 @@
17 if (AnnotationInternal::lookup(lExpandedQName) == AnnotationInternal::zann_end)
18 {
19 RAISE_ERROR(err::XQST0045, loc,
20- ERROR_PARAMS( "%" + (lExpandedQName->getPrefix().empty() ?
21- "\'" + lExpandedQName->getNamespace() + "\'"
22- : lExpandedQName->getPrefix())
23- + ":" + lExpandedQName->getLocalName()));
24+ ERROR_PARAMS( "%" + ("\"" + lExpandedQName->getNamespace() + "\""
25+ + ":" + lExpandedQName->getLocalName())));
26 }
27 }
28- else
29- {
30- // annotation in unknown namespace -- generate a warning
31- theCCB->theXQueryDiagnostics->add_warning(
32- NEW_XQUERY_WARNING(
33- zwarn::ZWST0002_UNKNOWN_ANNOTATION,
34- WARN_PARAMS( "%" + (lExpandedQName->getPrefix().empty() ?
35- "\'" + lExpandedQName->getNamespace() + "\'"
36- : lExpandedQName->getPrefix())
37- + ":" + lExpandedQName->getLocalName()),
38- WARN_LOC(loc)));
39- }
40
41 std::vector<rchandle<const_expr> > lLiterals;
42

Subscribers

People subscribed via source and target branches