lp:~zorba-coders/zorba/feature-empty_object

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:zorba at revision 11329

Nicolae Brinza: Approve on 2013-03-28

Matthias Brantner: Approve on 2013-03-27

Diff: 36336 lines (+7487/-7422)

9 files modified

src/compiler/parser/FlexLexer.h (+14/-12)
src/compiler/parser/jsoniq_parser.cpp (+5059/-5075)
src/compiler/parser/jsoniq_parser.hpp (+6/-6)
src/compiler/parser/jsoniq_parser.y (+11/-6)
src/compiler/parser/jsoniq_scanner.cpp (+429/-392)
src/compiler/parser/xquery_parser.cpp (+1535/-1535)
src/compiler/parser/xquery_parser.hpp (+6/-6)
src/compiler/parser/xquery_scanner.cpp (+424/-387)
test/rbkt/Queries/zorba/jsoniq/dataguide1.jq (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

11322. By Matthias Brantner on 2013-03-27

reverted back to old syntax for this test

11321. By Nicolae Brinza on 2013-03-27

Grammar changes: BlockExpression allows for ::= LBRACE RBRACE and interprets it as an empty object; removed ::= LBRACE RBRACE from the JSONObjectConstructor

11320. By Nicolae Brinza on 2013-03-27

Merged with Zorba trunk

11319. By Nicolae Brinza on 2013-03-25

Grammar changes: JSONObjectConstructor allows ::= LBRACE RBRACE; BlockExpr is now ::= LBRACE StatementsAndExpr RBRACE

11318. By Matthias Brantner on 2013-03-24

added missing test files

11317. By Matthias Brantner on 2013-03-24

- disallow strict inequality comparison for null
- improved error message for strict inequality comparison of QNames

11316. By Matthias Brantner on 2013-03-24

merge trunk

11315. By Matthias Brantner on 2013-03-24

merge lp:~zorba-coders/zorba/feature-empty_selectors

11314. By Matthias Brantner on 2013-03-24

- removed wildcard jsoniq select
- fixed test relying on general comparison

11313. By Matthias Brantner on 2013-03-24

- disabled general and node comparisons
- added more tests for jsoniq mode