lp:~zorba-coders/zorba/bug-1026250

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:zorba at revision 11609

Markos Zaharioudakis: Approve on 2013-08-30

Matthias Brantner: Approve on 2013-08-14

Diff: 993 lines (+563/-31)

31 files modified

include/zorba/pregenerated/diagnostic_list.h (+2/-0)
modules/pregenerated/zorba-errors.xq (+4/-0)
src/compiler/codegen/plan_visitor.cpp (+8/-7)
src/compiler/expression/flwor_expr.cpp (+22/-1)
src/compiler/expression/flwor_expr.h (+5/-2)
src/compiler/parser/parser.y (+4/-10)
src/compiler/parsetree/parsenodes.h (+1/-1)
src/compiler/translator/translator.cpp (+27/-0)
src/diagnostics/diagnostic_en.xml (+5/-1)
src/diagnostics/pregenerated/diagnostic_list.cpp (+3/-0)
src/diagnostics/pregenerated/dict_en.cpp (+2/-1)
src/store/naive/simple_collection.cpp (+25/-6)
src/store/naive/simple_collection.h (+3/-0)
test/rbkt/ExpCompilerResults/IterPlan/zorba/flwor/flwor24.iter (+56/-0)
test/rbkt/ExpCompilerResults/IterPlan/zorba/flwor/flwor25.iter (+56/-0)
test/rbkt/ExpCompilerResults/IterPlan/zorba/flwor/flwor26.iter (+66/-0)
test/rbkt/ExpCompilerResults/IterPlan/zorba/flwor/flwor27.iter (+63/-0)
test/rbkt/ExpCompilerResults/IterPlan/zorba/flwor/flwor28.iter (+57/-0)
test/rbkt/ExpQueryResults/zorba/flwor/flwor24.xml.res (+1/-0)
test/rbkt/ExpQueryResults/zorba/flwor/flwor25.xml.res (+1/-0)
test/rbkt/ExpQueryResults/zorba/flwor/flwor27.xml.res (+1/-0)
test/rbkt/ExpQueryResults/zorba/flwor/flwor28.xml.res (+1/-0)
test/rbkt/ExpQueryResults/zorba/scripting/flwor2.xml.res (+0/-2)
test/rbkt/Queries/zorba/flwor/flwor24.xml (+5/-0)
test/rbkt/Queries/zorba/flwor/flwor24.xq (+25/-0)
test/rbkt/Queries/zorba/flwor/flwor25.xq (+29/-0)
test/rbkt/Queries/zorba/flwor/flwor26.spec (+1/-0)
test/rbkt/Queries/zorba/flwor/flwor26.xq (+30/-0)
test/rbkt/Queries/zorba/flwor/flwor27.xq (+30/-0)
test/rbkt/Queries/zorba/flwor/flwor28.xq (+29/-0)
test/rbkt/Queries/zorba/scripting/flwor2.spec (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1026250: streaming and sequential flwor

High

Fix Released

Link a bug report

Related blueprints

11099. By Federico Cavalieri on 2013-08-16

Reverted further unnecessary modifications

11098. By Federico Cavalieri on 2013-08-16

Reverted additional unnecessary test modification

11097. By Federico Cavalieri on 2013-08-16

Completely reverted unnecessary test modifications

11096. By Federico Cavalieri on 2013-08-14

Fixed test28

11095. By Federico Cavalieri on 2013-08-14

Implemented no-streaming extension

11094. By Federico Cavalieri on 2013-08-12

Inverted annotation semantic

11093. By Federico Cavalieri on 2013-08-12

Fixed compilation

11092. By Federico Cavalieri on 2013-08-12

Merged trunk into the branch

11091. By Paul J. Lucas on 2012-12-06

Cleaned-up assert message.

11090. By Paul J. Lucas on 2012-12-06

Added operator<< for flwor_expr::ClauseKind.