~nbrinza/zorba/bugs

« back to all changes in this revision

Viewing changes to src/runtime/sequences/sequences_impl.cpp

Committer: Nicolae Brinza
Date: 2011-12-14 15:12:52 UTC
mfrom: (10534.1.49 zorba)
Revision ID: nbrinza@gmail.com-20111214151252-nwcd6rsi0vwowrf1

Merged changes from Zorba trunk

files added:
modules/com/zorba-xquery/www/modules/node-position.xq

src/functions/pregenerated/func_node_position.cpp

src/functions/pregenerated/func_node_position.h

src/runtime/nodes/node_position_impl.cpp

src/runtime/nodes/pregenerated/node_position.cpp

src/runtime/nodes/pregenerated/node_position.h

src/runtime/spec/nodes/node_position.xml

test/rbkt/ExpCompilerResults/IterPlan/zorba/error

test/rbkt/ExpCompilerResults/IterPlan/zorba/error/trace1.iter

test/rbkt/ExpCompilerResults/IterPlan/zorba/string

test/rbkt/ExpCompilerResults/IterPlan/zorba/string/SubstringFunc

test/rbkt/ExpCompilerResults/IterPlan/zorba/string/SubstringFunc/SubstringFunc2.iter

test/rbkt/ExpCompilerResults/IterPlan/zorba/string/SubstringFunc/SubstringFunc3.iter

test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf-fib-rec.iter

test/rbkt/ExpQueryResults/zorba/error/trace1.xml.res

test/rbkt/ExpQueryResults/zorba/fulltext/ft-same-sentence-false-2.xml.res

test/rbkt/ExpQueryResults/zorba/misc/baseuri.xml.res

test/rbkt/ExpQueryResults/zorba/nodes/position_1.xml.res

test/rbkt/ExpQueryResults/zorba/nodes/position_1_parsed.xml.res

test/rbkt/ExpQueryResults/zorba/nodes/position_2.xml.res

test/rbkt/ExpQueryResults/zorba/nodes/position_2_parsed.xml.res

test/rbkt/ExpQueryResults/zorba/nodes/position_3.xml.res

test/rbkt/ExpQueryResults/zorba/nodes/position_3_parsed.xml.res

test/rbkt/ExpQueryResults/zorba/nodes/position_4.xml.res

test/rbkt/ExpQueryResults/zorba/nodes/position_4_parsed.xml.res

test/rbkt/ExpQueryResults/zorba/nodes/position_err.xml.res

test/rbkt/ExpQueryResults/zorba/string/Regex

test/rbkt/ExpQueryResults/zorba/string/Regex/regex_a4.xml.res

test/rbkt/ExpQueryResults/zorba/udf/udf-fib-rec.xml.res

test/rbkt/ExpQueryResults/zorba/windowing/windowing12.xml.res

test/rbkt/Queries/zorba/error/trace1.xq

test/rbkt/Queries/zorba/fulltext/ft-same-sentence-false-2.xq

test/rbkt/Queries/zorba/misc/baseuri.xml

test/rbkt/Queries/zorba/misc/baseuri.xq

test/rbkt/Queries/zorba/nodes/position.xml

test/rbkt/Queries/zorba/nodes/position_1.xq

test/rbkt/Queries/zorba/nodes/position_1_parsed.xq

test/rbkt/Queries/zorba/nodes/position_2.xq

test/rbkt/Queries/zorba/nodes/position_2_parsed.xq

test/rbkt/Queries/zorba/nodes/position_3.xq

test/rbkt/Queries/zorba/nodes/position_3_parsed.xq

test/rbkt/Queries/zorba/nodes/position_4.xq

test/rbkt/Queries/zorba/nodes/position_4_parsed.xq

test/rbkt/Queries/zorba/nodes/position_err.xq

test/rbkt/Queries/zorba/string/Regex

test/rbkt/Queries/zorba/string/Regex/regex_a4.xq

test/rbkt/Queries/zorba/udf/udf-fib-rec.xq

test/rbkt/Queries/zorba/windowing/windowing12.xq

test/unit/cxx_api_ch1.xq

test/unit/cxx_api_ch2.xq

test/unit/cxx_api_ch3.xq

test/unit/cxx_api_ch4.xq

test/unit/cxx_api_changes.cpp

test/unit/testGetExtVarA.xq

test/unit/testGetExtVarB.xq

files renamed:
bin/module_path.cpp => bin/path_util.cpp

bin/module_path.h => bin/path_util.h

files modified:
CMakeLists.txt

CPackSourceConfig.cmake.in

ChangeLog

NOTICE.txt

bin/CMakeLists.txt

bin/zorbacmd.cpp

bin/zorbacmdproperties.cpp

bin/zorbacmdproperties.h

bin/zorbacmdproperties.txt

bin/zorbacmdproperties_base.h

cmake_modules/FindPHP5.cmake

cmake_modules/ZorbaModule.cmake

config/CMakeLists.txt

config/ZorbaConfig.cmake.in

doc/cxx/examples/errors.cpp

doc/zorba/commandline.dox

doc/zorba/external_functions.dox

doc/zorba/ft_thesaurus.dox

doc/zorba/impl_dep_features.dox

doc/zorba/modules_authoring.dox

doc/zorba/modules_authoring_2.dox

doc/zorba/modules_building_in.dox

doc/zorba/options.dox

doc/zorba/uriresolvers.dox

include/zorba/config.h.cmake

include/zorba/dynamic_context.h

include/zorba/internal/type_traits.h

include/zorba/internal/unique_ptr.h

include/zorba/pregenerated/diagnostic_list.h

include/zorba/static_collection_manager.h

include/zorba/static_context.h

include/zorba/thesaurus.h

include/zorba/uri_resolvers.h

include/zorba/xquery.h

include/zorba/zorba.h

modules/ExternalModules.conf

modules/com/zorba-xquery/www/modules/CMakeLists.txt

modules/com/zorba-xquery/www/modules/pregenerated/errors.xq

modules/com/zorba-xquery/www/modules/pregenerated/warnings.xq

src/annotations/annotations.cpp

src/annotations/annotations.h

src/api/collectionimpl.cpp

src/api/dynamiccontextimpl.cpp

src/api/dynamiccontextimpl.h

src/api/serialization/serializer.cpp

src/api/serialization/serializer.h

src/api/staticcollectionmanagerimpl.cpp

src/api/staticcollectionmanagerimpl.h

src/api/staticcontextimpl.cpp

src/api/staticcontextimpl.h

src/api/thesaurus.cpp

src/api/uri_resolver_wrappers.cpp

src/api/uri_resolver_wrappers.h

src/api/uriresolverimpl.cpp

src/api/uriresolverimpl.h

src/api/xqueryimpl.cpp

src/api/xqueryimpl.h

src/compiler/api/compiler_api.cpp

src/compiler/api/compilercb.cpp

src/compiler/api/compilercb.h

src/compiler/codegen/plan_visitor.cpp

src/compiler/expression/abstract_expr_visitor.h

src/compiler/expression/expr.cpp

src/compiler/expression/expr.h

src/compiler/expression/expr_annotations.cpp

src/compiler/expression/expr_base.cpp

src/compiler/expression/expr_base.h

src/compiler/expression/expr_classes.h

src/compiler/expression/expr_iter.cpp

src/compiler/expression/expr_put.cpp

src/compiler/expression/expr_type.cpp

src/compiler/expression/expr_visitor.h

src/compiler/expression/flwor_expr.cpp

src/compiler/expression/flwor_expr.h

src/compiler/expression/fo_expr.cpp

src/compiler/expression/script_exprs.cpp

src/compiler/expression/script_exprs.h

src/compiler/expression/var_expr.cpp

src/compiler/expression/var_expr.h

src/compiler/rewriter/rules/fold_rules.cpp

src/compiler/rewriter/rules/nodeid_rules.cpp

src/compiler/rewriter/rules/ruleset.h

src/compiler/rewriter/rules/type_rules.cpp

src/compiler/rewriter/tools/dataflow_annotations.cpp

src/compiler/rewriter/tools/dataflow_annotations.h

src/compiler/rewriter/tools/expr_tools.cpp

src/compiler/translator/translator.cpp

src/context/default_uri_mappers.cpp

src/context/default_uri_mappers.h

src/context/default_url_resolvers.cpp

src/context/default_url_resolvers.h

src/context/dynamic_context.cpp

src/context/dynamic_context.h

src/context/dynamic_loader.cpp

src/context/dynamic_loader.h

src/context/root_static_context.cpp

src/context/root_static_context.h

src/context/root_static_context_init.cpp.in

src/context/static_context.cpp

src/context/static_context.h

src/context/static_context_consts.h

src/context/thesaurus_wrappers.cpp

src/context/thesaurus_wrappers.h

src/context/uri_resolver.cpp

src/context/uri_resolver.h

src/diagnostics/diagnostic_en.xml

src/diagnostics/dict_XX_cpp.xq

src/diagnostics/pregenerated/diagnostic_list.cpp

src/diagnostics/pregenerated/dict_en.cpp

src/functions/external_function.h

src/functions/func_errors_and_diagnostics_impl.cpp

src/functions/func_sequences_impl.cpp

src/functions/func_strings_impl.cpp

src/functions/func_var_decl.cpp

src/functions/function_consts.h

src/functions/library.cpp

src/functions/pregenerated/func_errors_and_diagnostics.h

src/functions/pregenerated/func_strings.cpp

src/functions/pregenerated/func_strings.h

src/functions/pregenerated/function_enum.h

src/functions/signature.cpp

src/functions/signature.h

src/functions/udf.cpp

src/functions/udf.h

src/runtime/booleans/BooleanImpl.cpp

src/runtime/collections/collections_impl.cpp

src/runtime/core/flwor_iterator.cpp

src/runtime/core/fncall_iterator.cpp

src/runtime/core/fncall_iterator.h

src/runtime/core/gflwor/common.cpp

src/runtime/core/gflwor/common.h

src/runtime/core/gflwor/groupby_iterator.cpp

src/runtime/core/gflwor/window_iterator.cpp

src/runtime/core/path_iterators.h

src/runtime/core/trycatch.cpp

src/runtime/core/var_iterators.cpp

src/runtime/core/var_iterators.h

src/runtime/eval/eval.cpp

src/runtime/eval/eval.h

src/runtime/fetch/fetch_impl.cpp

src/runtime/full_text/apply.cpp

src/runtime/full_text/ft_stop_words_set.cpp

src/runtime/full_text/icu_tokenizer.cpp

src/runtime/full_text/icu_tokenizer.h

src/runtime/full_text/thesauri/wn_synset.cpp

src/runtime/full_text/thesaurus.cpp

src/runtime/full_text/thesaurus.h

src/runtime/misc/materialize.cpp

src/runtime/sequences/sequences_impl.cpp

src/runtime/spec/errors_and_diagnostics/errors_and_diagnostics.xml

src/runtime/spec/mappings.xml

src/runtime/spec/strings/strings.xml

src/runtime/strings/pregenerated/strings.cpp

src/runtime/strings/pregenerated/strings.h

src/runtime/strings/strings_impl.cpp

src/runtime/visitors/planiter_visitor_impl_code.h

src/runtime/visitors/pregenerated/planiter_visitor.h

src/runtime/visitors/pregenerated/printer_visitor.cpp

src/runtime/visitors/pregenerated/printer_visitor.h

src/runtime/visitors/printer_visitor_impl.cpp

src/runtime/visitors/printer_visitor_impl.h

src/runtime/xqdoc/xqdoc_impl.cpp

src/store/api/index.h

src/store/api/item.h

src/store/api/item_factory.h

src/store/api/shared_types.h

src/store/api/store.h

src/store/api/temp_seq.h

src/store/naive/atomic_items.cpp

src/store/naive/atomic_items.h

src/store/naive/item.cpp

src/store/naive/loader_dtd.cpp

src/store/naive/loader_fast.cpp

src/store/naive/node_items.cpp

src/store/naive/node_items.h

src/store/naive/nsbindings.h

src/store/naive/ordpath.cpp

src/store/naive/ordpath.h

src/store/naive/pul_primitives.cpp

src/store/naive/pul_primitives.h

src/store/naive/qname_pool.h

src/store/naive/simple_index_general.cpp

src/store/naive/simple_index_general.h

src/store/naive/simple_item_factory.cpp

src/store/naive/simple_item_factory.h

src/store/naive/simple_lazy_temp_seq.cpp

src/store/naive/simple_lazy_temp_seq.h

src/store/naive/simple_store.cpp

src/store/naive/simple_store.h

src/store/naive/simple_temp_seq.cpp

src/store/naive/simple_temp_seq.h

src/system/globalenv.cpp

src/system/globalenv.h

src/types/schema/schema.cpp

src/types/schema/schema.h

src/util/http_util.cpp

src/util/unicode_util.h

src/zorbatypes/URI.cpp

swig/CMakeLists.txt

swig/php/CMakeLists.txt

swig/php/generate_proxy.php.in

test/rbkt/Queries/CMakeLists.txt

test/rbkt/Queries/w3c_known_failures.txt

test/rbkt/Queries/zorba/annotations/annot-unknown-02.spec

test/rbkt/Queries/zorba/annotations/annot-unknown-02.xq

test/rbkt/Queries/zorba/annotations/annot-unknown-04.spec

test/rbkt/Queries/zorba/annotations/annot-unknown-04.xq

test/rbkt/Scripts/w3c/generate-submission-xqftts.xq

test/rbkt/Scripts/w3c/generate-submission-xqts.xq

test/rbkt/specification.h

test/rbkt/testdriver_common.cpp

test/rbkt/testdriver_mt.cpp

test/unit/CMakeLists.txt

test/unit/guestbook.xq

test/unit/guestbook_main.xq

test/unit/module2.xq

test/unit/staticcollectionmanager.cpp

test/unit/thesaurus.cpp

test/update/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

src/runtime/sequences/sequences_impl.cpp

1819

1820

// Resolve URI to a stream

1821

zstring lErrorMessage;

1822

std::auto_ptr<impl::Resource> lResource = aSctx->resolve_uri

1823

(lNormUri, impl::EntityData::DOCUMENT, lErrorMessage);

1824

impl::StreamResource* lStreamResource =

1825

dynamic_cast<impl::StreamResource*>(lResource.get());

1822

std::auto_ptr<internal::Resource> lResource = aSctx->resolve_uri

1823

(lNormUri, internal::EntityData::DOCUMENT, lErrorMessage);

1824

internal::StreamResource* lStreamResource =

1825

dynamic_cast<internal::StreamResource*>(lResource.get());

1826

if (lStreamResource == NULL) {

1827

throw XQUERY_EXCEPTION

1828

(err::FODC0002, ERROR_PARAMS(aUri, lErrorMessage), ERROR_LOC(loc));

Older »