checkpoint

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>

mk_make.py

@@ -16,29 +16,44 @@ set_vs_options('WIN32;_WINDOWS;ASYNC_COMMANDS',
                'Z3DEBUG;_TRACE;_DEBUG',
                'NDEBUG;_EXTERNAL_RELEASE')
 
+add_header('api_headers')
 add_lib('util', [])
 add_lib('polynomial', ['util'])
-add_lib('sat', ['util', 'sat_core'])
-add_lib('nlsat', ['util', 'sat_core', 'polynomial'])
+add_lib('sat', ['util'])
+# nlsat only reuses the file sat_types.h from sat
+add_lib('nlsat', ['polynomial', 'sat'])
 add_lib('subpaving', ['util'])
 add_lib('ast', ['util', 'polynomial'])
-add_lib('rewriter', ['util', 'ast', 'polynomial'])
-# Old (non-modular) parameter framework. It has been subsumed by util\params.h.
-# However, it is still used by many old components.
-add_lib('old_params', ['util', 'ast', 'model'])
+add_lib('rewriter', ['ast', 'polynomial'])
 # Simplifier module will be deleted in the future.
 # It has been replaced with rewriter module.
-add_lib('simplifier', ['util', 'ast', 'rewriter', 'old_params'])
+add_lib('simplifier', ['rewriter'])
 # Model module should not depend on simplifier module. 
 # We must replace all occurrences of simplifier with rewriter.
-add_lib('model', ['util', 'ast', 'rewriter', 'simplifier', 'old_params'])
-add_lib('framework', ['util', 'ast', 'model', 'old_params', 'simplifier', 'rewriter'])
+add_lib('model', ['rewriter', 'simplifier'])
+# Old (non-modular) parameter framework. It has been subsumed by util\params.h.
+# However, it is still used by many old components.
+add_lib('old_params', ['model', 'simplifier'])
+add_lib('framework', ['rewriter', 'model', 'old_params', 'simplifier'])
 # Assertion set is the old tactic framework used in Z3 3.x. It will be deleted as soon as we finish the porting old
 # code to the new tactic framework.
-add_lib('assertion_set', ['util', 'ast', 'framework', 'model', 'rewriter', 'old_params'])
-add_lib('normal_forms', ['util', 'ast', 'old_params', 'simplifier', 'rewriter', 'assertion_set', 'framework', 'model'])
-add_lib('spc', ['util', 'ast', 'simplifier', 'pattern', 'model', 'old_params', 'normal_forms', 'rewriter'])
-add_lib('parser_util', ['util', 'ast'])
-add_lib('smt2parser', ['util', 'ast', 'framework', 'model', 'old_params', 'rewriter', 'parser_util'])
-add_lib('pattern', ['util', 'ast', 'simplifier', 'old_params'])
-add_lib('smt', ['util', 'ast', 'assertion_set'])
+add_lib('assertion_set', ['framework'])
+add_lib('substitution', ['ast'])
+add_lib('normal_forms', ['framework', 'assertion_set'])
+add_lib('pattern', ['normal_forms'])
+add_lib('spc', ['simplifier', 'substitution', 'old_params', 'pattern'])
+add_lib('parser_util', ['ast'])
+add_lib('smt2parser', ['framework', 'parser_util'])
+add_lib('macros', ['simplifier', 'old_params'])
+add_lib('grobner', ['ast'])
+add_lib('euclid', ['util'])
+add_lib('proof_checker', ['rewriter', 'spc'])
+add_lib('bit_blaster', ['rewriter', 'simplifier', 'old_params', 'framework', 'assertion_set'])
+add_lib('smt', ['assertion_set', 'bit_blaster', 'macros', 'normal_forms', 'framework', 
+                'substitution', 'grobner', 'euclid', 'proof_checker', 'pattern', 'parser_util'])
+add_lib('sat_tactic', ['framework', 'sat'])
+add_lib('sat_strategy', ['assertion_set', 'sat_tactic'])
+# TODO: split muz_qe into muz, qe. Perhaps, we should also consider breaking muz into muz and pdr.
+add_lib('muz_qe', ['smt', 'sat', 'smt2parser'])
+# TODO: delete SMT 1.0 frontend
+add_lib('smtparser', ['api_headers', 'smt', 'spc'])

mk_util.py

@@ -35,6 +35,16 @@ VS_COMMON_OPTIONS='WIN32'
 VS_DBG_OPTIONS='_DEBUG'
 VS_RELEASE_OPTIONS='NDEBUG'
 
+HEADERS = []
+LIBS = []
+LIB_DEPS = {}
+
+class MKException(Exception):
+    def __init__(self, value):
+        self.value = value
+    def __str__(self):
+        return repr(self.value)
+
 def set_vs_options(common, dbg, release):
     global VS_COMMON_OPTIONS, VS_DBG_OPTIONS, VS_RELEASE_OPTIONS
     VS_COMMON_OPTIONS = common
@@ -172,8 +182,39 @@ def vs_footer(f):
 '  <ImportGroup Label="ExtensionTargets">\n'
 '  </ImportGroup>\n'
 '</Project>\n')
-   
+
+def check_new_component(name):
+    if (name in HEADERS) or (name in LIBS):
+        raise MKException("Component '%s' was already defined" % name)
+
+# Add a directory containing only .h files
+def add_header(name):
+    check_new_component(name)
+    HEADERS.append(name)
+
+def find_all_deps(name, deps):
+    new_deps = []
+    for dep in deps:
+        if dep in LIBS:
+            if not (dep in new_deps):
+                new_deps.append(dep)
+            for dep_dep in LIB_DEPS[dep]:
+                if not (dep_dep in new_deps):
+                    new_deps.append(dep_dep)
+        elif dep in HEADERS:
+            if not (dep in new_deps):
+                new_deps.append(dep)
+        else:
+            raise MKException("Unknown component '%s' at '%s'." % (dep, name))
+    return new_deps
+
 def add_lib(name, deps):
+    check_new_component(name)
+    LIBS.append(name)
+    deps = find_all_deps(name, deps)
+    LIB_DEPS[name] = deps
+    print "Dependencies for '%s': %s" % (name, deps)
+
     module_dir = module_build_dir(name)
     mk_dir(module_dir)
 

src/muz_qe/README

@@ -0,0 +1 @@
+muZ and Quantifier Elimination modules