From 2b8fb6c718d24138a48d319453667aeb602d4df8 Mon Sep 17 00:00:00 2001 From: Leonardo de Moura Date: Sat, 20 Oct 2012 20:53:33 -0700 Subject: [PATCH] Reorganizing the code Signed-off-by: Leonardo de Moura --- mk_make.py | 14 +++++++------- {lib => src/model}/array_factory.cpp | 0 {lib => src/model}/array_factory.h | 0 {lib => src/model}/datatype_factory.cpp | 0 {lib => src/model}/datatype_factory.h | 0 {lib => src/model}/numeral_factory.cpp | 0 {lib => src/model}/numeral_factory.h | 0 {lib => src/model}/struct_factory.cpp | 0 {lib => src/model}/struct_factory.h | 0 .../arith_simplifier_params.h | 0 .../bv_simplifier_params.h | 0 .../simplifier}/array_simplifier_plugin.cpp | 0 {lib => src/simplifier}/array_simplifier_plugin.h | 0 13 files changed, 7 insertions(+), 7 deletions(-) rename {lib => src/model}/array_factory.cpp (100%) rename {lib => src/model}/array_factory.h (100%) rename {lib => src/model}/datatype_factory.cpp (100%) rename {lib => src/model}/datatype_factory.h (100%) rename {lib => src/model}/numeral_factory.cpp (100%) rename {lib => src/model}/numeral_factory.h (100%) rename {lib => src/model}/struct_factory.cpp (100%) rename {lib => src/model}/struct_factory.h (100%) rename src/{simplifier => old_params}/arith_simplifier_params.h (100%) rename src/{simplifier => old_params}/bv_simplifier_params.h (100%) rename {lib => src/simplifier}/array_simplifier_plugin.cpp (100%) rename {lib => src/simplifier}/array_simplifier_plugin.h (100%) diff --git a/mk_make.py b/mk_make.py index 9481e10b9..f66dcd75f 100644 --- a/mk_make.py +++ b/mk_make.py @@ -23,14 +23,14 @@ add_lib('nlsat', ['util', 'sat_core', 'polynomial']) add_lib('subpaving', ['util']) add_lib('ast', ['util', 'polynomial']) add_lib('rewriter', ['util', 'ast', 'polynomial']) -# Simplifier module will be deleted in the future. -# It has been replaced with rewriter module. -add_lib('simplifier', ['util', 'ast', '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 (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', 'simplifier', 'model']) +add_lib('old_params', ['util', 'ast', 'model']) +# Simplifier module will be deleted in the future. +# It has been replaced with rewriter module. +add_lib('simplifier', ['util', 'ast', 'rewriter', 'old_params']) +# 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']) diff --git a/lib/array_factory.cpp b/src/model/array_factory.cpp similarity index 100% rename from lib/array_factory.cpp rename to src/model/array_factory.cpp diff --git a/lib/array_factory.h b/src/model/array_factory.h similarity index 100% rename from lib/array_factory.h rename to src/model/array_factory.h diff --git a/lib/datatype_factory.cpp b/src/model/datatype_factory.cpp similarity index 100% rename from lib/datatype_factory.cpp rename to src/model/datatype_factory.cpp diff --git a/lib/datatype_factory.h b/src/model/datatype_factory.h similarity index 100% rename from lib/datatype_factory.h rename to src/model/datatype_factory.h diff --git a/lib/numeral_factory.cpp b/src/model/numeral_factory.cpp similarity index 100% rename from lib/numeral_factory.cpp rename to src/model/numeral_factory.cpp diff --git a/lib/numeral_factory.h b/src/model/numeral_factory.h similarity index 100% rename from lib/numeral_factory.h rename to src/model/numeral_factory.h diff --git a/lib/struct_factory.cpp b/src/model/struct_factory.cpp similarity index 100% rename from lib/struct_factory.cpp rename to src/model/struct_factory.cpp diff --git a/lib/struct_factory.h b/src/model/struct_factory.h similarity index 100% rename from lib/struct_factory.h rename to src/model/struct_factory.h diff --git a/src/simplifier/arith_simplifier_params.h b/src/old_params/arith_simplifier_params.h similarity index 100% rename from src/simplifier/arith_simplifier_params.h rename to src/old_params/arith_simplifier_params.h diff --git a/src/simplifier/bv_simplifier_params.h b/src/old_params/bv_simplifier_params.h similarity index 100% rename from src/simplifier/bv_simplifier_params.h rename to src/old_params/bv_simplifier_params.h diff --git a/lib/array_simplifier_plugin.cpp b/src/simplifier/array_simplifier_plugin.cpp similarity index 100% rename from lib/array_simplifier_plugin.cpp rename to src/simplifier/array_simplifier_plugin.cpp diff --git a/lib/array_simplifier_plugin.h b/src/simplifier/array_simplifier_plugin.h similarity index 100% rename from lib/array_simplifier_plugin.h rename to src/simplifier/array_simplifier_plugin.h