Consolidate redundant path/file public APIs
Bug #1180220 reported by
Chris Hillery
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Zorba |
Fix Committed
|
High
|
Paul J. Lucas |
Bug Description
We have include/
Neither of these classes are actually used in our public APIs much, so it's not clear we need either let alone both. We need an internal class for files (we may have another one). Could we move these out of the API entirely? If not, we need to reduce to one common class that makes sense.
Related branches
lp:~zorba-coders/zorba/bug-1180220
- Chris Hillery: Approve
- Matthias Brantner: Approve
- Paul J. Lucas: Approve
-
Diff: 7823 lines (+2000/-2932)128 files modifiedChangeLog (+1/-0)
bin/path_util.cpp (+8/-8)
bin/zorbacmd.cpp (+17/-28)
include/zorba/api_shared_types.h (+60/-64)
include/zorba/base64_stream.h (+2/-1)
include/zorba/file.h (+0/-100)
include/zorba/internal/cxx_util.h (+6/-4)
include/zorba/internal/unique_ptr.h (+10/-8)
include/zorba/internal/ztd.h (+3/-1)
include/zorba/stemmer.h (+2/-1)
include/zorba/thesaurus.h (+2/-1)
include/zorba/tokenizer.h (+7/-5)
include/zorba/transcode_stream.h (+2/-1)
include/zorba/user_exception.h (+4/-3)
include/zorba/util/error_util.h (+11/-16)
include/zorba/util/file.h (+0/-122)
include/zorba/util/fs_util.h (+627/-0)
include/zorba/util/path.h (+0/-105)
include/zorba/util/stream_util.h (+48/-0)
modules/ExternalModules.conf (+10/-9)
modules/org/expath/ns/file.xq.src/file.cpp (+340/-441)
modules/org/expath/ns/file.xq.src/file.h (+8/-6)
modules/org/expath/ns/file.xq.src/file_function.cpp (+58/-87)
modules/org/expath/ns/file.xq.src/file_function.h (+4/-10)
src/api/CMakeLists.txt (+0/-5)
src/api/fileimpl.cpp (+0/-404)
src/api/fileimpl.h (+0/-94)
src/api/staticcontextimpl.cpp (+3/-3)
src/api/stemmer_wrappers.cpp (+1/-1)
src/api/thesaurus_wrappers.cpp (+1/-1)
src/api/zorba_string.cpp (+1/-1)
src/compiler/expression/ftnode.cpp (+1/-1)
src/compiler/expression/ftnode.h (+1/-2)
src/compiler/expression/ftnode_visitor.cpp (+1/-1)
src/compiler/parser/ft_types.cpp (+1/-1)
src/context/default_uri_mappers.cpp (+1/-1)
src/context/default_url_resolvers.cpp (+13/-8)
src/context/dynamic_loader.cpp (+6/-5)
src/diagnostics/assert.h (+1/-1)
src/diagnostics/diagnostic_en.xml (+0/-4)
src/diagnostics/pregenerated/dict_en.cpp (+0/-1)
src/diagnostics/pregenerated/dict_zed_keys.h (+0/-1)
src/diagnostics/user_exception.h (+1/-1)
src/diagnostics/xquery_diagnostics.h (+1/-2)
src/diagnostics/xquery_exception.cpp (+1/-1)
src/precompiled/stdafx.h (+1/-1)
src/runtime/full_text/apply.cpp (+2/-2)
src/runtime/full_text/ft_module_util.h (+3/-3)
src/runtime/full_text/ft_query_item.cpp (+2/-1)
src/runtime/full_text/ft_stop_words_set.cpp (+1/-1)
src/runtime/full_text/ft_token_matcher.cpp (+3/-3)
src/runtime/full_text/ft_token_seq_iterator.cpp (+2/-1)
src/runtime/full_text/ft_util.h (+1/-1)
src/runtime/full_text/ftcontains_visitor.cpp (+2/-1)
src/runtime/full_text/icu_tokenizer.cpp (+1/-1)
src/runtime/full_text/icu_tokenizer.h (+1/-2)
src/runtime/full_text/stemmer.cpp (+2/-1)
src/runtime/full_text/stemmer/sb_stemmer.cpp (+2/-1)
src/runtime/full_text/thesauri/encoded_list.h (+1/-1)
src/runtime/full_text/thesauri/wn_thesaurus.cpp (+8/-11)
src/runtime/full_text/thesaurus.cpp (+16/-12)
src/runtime/json/json_impl.cpp (+1/-2)
src/runtime/json/jsonml_array.cpp (+1/-1)
src/runtime/json/snelson.cpp (+1/-1)
src/runtime/util/doc_uri_heuristics.cpp (+23/-17)
src/store/naive/ft_token_store.h (+2/-1)
src/store/naive/naive_ft_token_iterator.cpp (+2/-1)
src/store/naive/store.cpp (+2/-1)
src/unit_tests/CMakeLists.txt (+2/-6)
src/unit_tests/test_ato_.cpp (+2/-1)
src/unit_tests/test_fs_iterator.cpp (+0/-54)
src/unit_tests/test_fs_util.cpp (+178/-0)
src/unit_tests/test_mem_sizeof.cpp (+2/-1)
src/unit_tests/test_string.cpp (+3/-3)
src/unit_tests/unit_test_list.h (+1/-4)
src/unit_tests/unit_tests.cpp (+1/-5)
src/util/CMakeLists.txt (+0/-1)
src/util/base64_util.h (+1/-1)
src/util/cxx_util.cpp (+2/-2)
src/util/error_util.cpp (+16/-11)
src/util/file.cpp (+0/-337)
src/util/fs_util.cpp (+232/-120)
src/util/fs_util.h (+2/-429)
src/util/fx/fxcharheap.cpp (+0/-2)
src/util/hash/hashtable.h (+2/-2)
src/util/hexbinary_util.h (+2/-1)
src/util/http_util.cpp (+6/-4)
src/util/icu_regex.cpp (+2/-1)
src/util/icu_regex.h (+2/-1)
src/util/icu_streambuf.cpp (+1/-1)
src/util/json_parser.h (+1/-1)
src/util/mem_streambuf.cpp (+2/-1)
src/util/mmap_file.cpp (+3/-2)
src/util/stl_util.h (+1/-2)
src/util/stream_util.cpp (+14/-0)
src/util/stream_util.h (+1/-1)
src/util/string/buf_rep.h (+1/-1)
src/util/string/default_rep.h (+2/-1)
src/util/string/ptr_rep.h (+2/-1)
src/util/string/rep_proxy.h (+1/-2)
src/util/string/rstring.h (+2/-1)
src/util/string_util.cpp (+2/-1)
src/util/string_util.h (+1/-1)
src/util/time_parse.cpp (+1/-1)
src/util/time_parse.h (+1/-1)
src/util/time_util.h (+1/-1)
src/util/unicode_util.cpp (+1/-1)
src/util/unordered_map.h (+2/-1)
src/util/unordered_set.h (+2/-1)
src/util/uri_util.cpp (+1/-1)
src/util/uri_util.h (+4/-2)
src/util/utf8_streambuf.cpp (+1/-1)
src/util/utf8_util.cpp (+4/-1)
src/util/utf8_util.h (+2/-1)
src/util/zorba_regex.h (+2/-1)
src/zorbatypes/URI.cpp (+0/-2)
src/zorbatypes/ft_token.cpp (+2/-1)
src/zorbatypes/ft_token.h (+1/-1)
src/zorbatypes/integer.cpp (+1/-1)
src/zorbautils/locale.cpp (+1/-1)
test/apitest.cpp (+8/-9)
test/driver/sax2testdriver.cpp (+34/-29)
test/driver/testdriver.cpp (+43/-44)
test/driver/updtestdriver.cpp (+52/-50)
test/unit/CMakeLists.txt (+0/-2)
test/unit/path_resolver.cpp (+0/-68)
test/unit/test_filesystempath.cpp (+0/-80)
test/unit/uri_file_decoding_test.cpp (+2/-2)
tags: | added: incompatible-change |
Changed in zorba: | |
status: | In Progress → Fix Committed |
To post a comment you must log in.
Assigning to Paul for now as he has good ideas about at least some of these APIs internally, and can probably at least propose what should be done.