← Back to branch summary

~zorba-coders/zorba/skiplimit

~zorba-coders/zorba/skiplimit

Viewing all changes in revision 11570.

Committer: Paul J. Lucas
Date: 2014-03-17 23:49:01 UTC
mfrom: (11557.1.151 lp_zorba)
Revision ID: paul@lucasmail.org-20140317234901-3105qd90u2tx7txz

Merge from trunk.

files added:
test/rbkt/ExpQueryResults/zorba/jsound/jsound-content-err-01.xml.res

files removed:
test/rbkt/Queries/zorba/jsound/jsound-content-err-01.spec

files modified:
src/compiler/parser/jsoniq_parser.cpp

src/compiler/parser/jsoniq_scanner.cpp

src/compiler/parser/parser.y

src/compiler/parser/scanner.l

src/compiler/parser/xquery_parser.cpp

src/compiler/parser/xquery_scanner.cpp

src/diagnostics/diagnostic_en.xml

src/diagnostics/pregenerated/dict_en.cpp

src/diagnostics/pregenerated/dict_zed_keys.h

src/runtime/jsound/jsound_util.cpp

test/rbkt/Queries/zorba/jsound/jsound-content-err-01.jq

Show diffs side-by-side

added added

removed removed

src/compiler/parser/jsoniq_parser.cpp

src/compiler/parser/jsoniq_scanner.cpp

src/compiler/parser/parser.y

src/compiler/parser/scanner.l

src/compiler/parser/xquery_parser.cpp

src/compiler/parser/xquery_scanner.cpp

src/diagnostics/diagnostic_en.xml

src/diagnostics/pregenerated/dict_en.cpp

src/diagnostics/pregenerated/dict_zed_keys.h

src/runtime/jsound/jsound_util.cpp

test/rbkt/ExpQueryResults/zorba/jsound/jsound-content-err-01.xml.res

test/rbkt/Queries/zorba/jsound/jsound-content-err-01.jq

test/rbkt/Queries/zorba/jsound/jsound-content-err-01.spec

Older »