mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-10 13:10:50 +00:00
Code Activity

Merge branch 'master' of https://github.com/Z3Prover/z3

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2017-05-05 14:22:49 +01:00
commit 00ce3f8172
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
contrib/cmake/doc/CMakeLists.txt
View file

@ -67,7 +67,6 @@ add_custom_target(api_docs ${ALWAYS_BUILD_DOCS_ARG}
${JAVA_API_OPTIONS} ${JAVA_API_OPTIONS}
DEPENDS DEPENDS
${DOC_EXTRA_DEPENDS} ${DOC_EXTRA_DEPENDS}
BYPRODUCTS "${DOC_DEST_DIR}"
COMMENT "Generating documentation" COMMENT "Generating documentation"
${ADD_CUSTOM_TARGET_USES_TERMINAL_ARG} ${ADD_CUSTOM_TARGET_USES_TERMINAL_ARG}
) )

10
doc/mk_api_doc.py
View file

@ -103,15 +103,17 @@ def parse_options():
TEMP_DIR = pargs.temp_dir TEMP_DIR = pargs.temp_dir
OUTPUT_DIRECTORY = pargs.output_dir OUTPUT_DIRECTORY = pargs.output_dir
Z3PY_PACKAGE_PATH = pargs.z3py_package_path Z3PY_PACKAGE_PATH = pargs.z3py_package_path
if not os.path.exists(Z3PY_PACKAGE_PATH):
raise Exception('"{}" does not exist'.format(Z3PY_PACKAGE_PATH))
if not os.path.basename(Z3PY_PACKAGE_PATH) == 'z3':
raise Exception('"{}" does not end with "z3"'.format(Z3PY_PACKAGE_PATH))
Z3PY_ENABLED = not pargs.no_z3py Z3PY_ENABLED = not pargs.no_z3py
DOTNET_ENABLED = not pargs.no_dotnet DOTNET_ENABLED = not pargs.no_dotnet
JAVA_ENABLED = not pargs.no_java JAVA_ENABLED = not pargs.no_java
DOTNET_API_SEARCH_PATHS = pargs.dotnet_search_paths DOTNET_API_SEARCH_PATHS = pargs.dotnet_search_paths
JAVA_API_SEARCH_PATHS = pargs.java_search_paths JAVA_API_SEARCH_PATHS = pargs.java_search_paths
if Z3PY_ENABLED:
if not os.path.exists(Z3PY_PACKAGE_PATH):
raise Exception('"{}" does not exist'.format(Z3PY_PACKAGE_PATH))
if not os.path.basename(Z3PY_PACKAGE_PATH) == 'z3':
raise Exception('"{}" does not end with "z3"'.format(Z3PY_PACKAGE_PATH))
return return
def mk_dir(d): def mk_dir(d):

5
src/util/obj_pair_set.h
View file

@ -46,6 +46,11 @@ public:
bool contains(obj_pair const & p) const { return m_set.contains(p); } bool contains(obj_pair const & p) const { return m_set.contains(p); }
void reset() { m_set.reset(); } void reset() { m_set.reset(); }
bool empty() const { return m_set.empty(); } bool empty() const { return m_set.empty(); }
typedef typename chashtable<obj_pair, hash_proc, eq_proc>::iterator iterator;
iterator begin() { return m_set.begin(); }
iterator end() { return m_set.end(); }
}; };
#endif #endif