From 6bc591c67e7bb1809248aac6d98be76854b25108 Mon Sep 17 00:00:00 2001 From: Leonardo de Moura Date: Sat, 20 Oct 2012 22:44:27 -0700 Subject: [PATCH] Reorganizing the code Signed-off-by: Leonardo de Moura --- mk_make.py | 6 ++++-- {lib => src/ast}/has_free_vars.cpp | 0 {lib => src/ast}/has_free_vars.h | 0 {lib => src/framework}/extension_model_converter.cpp | 0 {lib => src/framework}/extension_model_converter.h | 0 {lib => src/framework}/filter_model_converter.cpp | 0 {lib => src/framework}/filter_model_converter.h | 0 src/{model => old_params}/model_params.cpp | 0 src/{model => old_params}/model_params.h | 0 src/{pattern => parser_util}/pattern_validation.cpp | 0 src/{pattern => parser_util}/pattern_validation.h | 0 {lib => src/smt2parser}/smt2parser.cpp | 0 {lib => src/smt2parser}/smt2parser.h | 0 {lib => src/smt2parser}/smt2scanner.cpp | 0 {lib => src/smt2parser}/smt2scanner.h | 0 15 files changed, 4 insertions(+), 2 deletions(-) rename {lib => src/ast}/has_free_vars.cpp (100%) rename {lib => src/ast}/has_free_vars.h (100%) rename {lib => src/framework}/extension_model_converter.cpp (100%) rename {lib => src/framework}/extension_model_converter.h (100%) rename {lib => src/framework}/filter_model_converter.cpp (100%) rename {lib => src/framework}/filter_model_converter.h (100%) rename src/{model => old_params}/model_params.cpp (100%) rename src/{model => old_params}/model_params.h (100%) rename src/{pattern => parser_util}/pattern_validation.cpp (100%) rename src/{pattern => parser_util}/pattern_validation.h (100%) rename {lib => src/smt2parser}/smt2parser.cpp (100%) rename {lib => src/smt2parser}/smt2parser.h (100%) rename {lib => src/smt2parser}/smt2scanner.cpp (100%) rename {lib => src/smt2parser}/smt2scanner.h (100%) diff --git a/mk_make.py b/mk_make.py index 3500fac03..d52d423d8 100644 --- a/mk_make.py +++ b/mk_make.py @@ -37,6 +37,8 @@ add_lib('framework', ['util', 'ast', 'model', 'old_params', 'simplifier', 'rewri # 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('smt', ['util', 'ast', 'assertion_set']) -add_lib('pattern', ['util', 'ast']) 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']) diff --git a/lib/has_free_vars.cpp b/src/ast/has_free_vars.cpp similarity index 100% rename from lib/has_free_vars.cpp rename to src/ast/has_free_vars.cpp diff --git a/lib/has_free_vars.h b/src/ast/has_free_vars.h similarity index 100% rename from lib/has_free_vars.h rename to src/ast/has_free_vars.h diff --git a/lib/extension_model_converter.cpp b/src/framework/extension_model_converter.cpp similarity index 100% rename from lib/extension_model_converter.cpp rename to src/framework/extension_model_converter.cpp diff --git a/lib/extension_model_converter.h b/src/framework/extension_model_converter.h similarity index 100% rename from lib/extension_model_converter.h rename to src/framework/extension_model_converter.h diff --git a/lib/filter_model_converter.cpp b/src/framework/filter_model_converter.cpp similarity index 100% rename from lib/filter_model_converter.cpp rename to src/framework/filter_model_converter.cpp diff --git a/lib/filter_model_converter.h b/src/framework/filter_model_converter.h similarity index 100% rename from lib/filter_model_converter.h rename to src/framework/filter_model_converter.h diff --git a/src/model/model_params.cpp b/src/old_params/model_params.cpp similarity index 100% rename from src/model/model_params.cpp rename to src/old_params/model_params.cpp diff --git a/src/model/model_params.h b/src/old_params/model_params.h similarity index 100% rename from src/model/model_params.h rename to src/old_params/model_params.h diff --git a/src/pattern/pattern_validation.cpp b/src/parser_util/pattern_validation.cpp similarity index 100% rename from src/pattern/pattern_validation.cpp rename to src/parser_util/pattern_validation.cpp diff --git a/src/pattern/pattern_validation.h b/src/parser_util/pattern_validation.h similarity index 100% rename from src/pattern/pattern_validation.h rename to src/parser_util/pattern_validation.h diff --git a/lib/smt2parser.cpp b/src/smt2parser/smt2parser.cpp similarity index 100% rename from lib/smt2parser.cpp rename to src/smt2parser/smt2parser.cpp diff --git a/lib/smt2parser.h b/src/smt2parser/smt2parser.h similarity index 100% rename from lib/smt2parser.h rename to src/smt2parser/smt2parser.h diff --git a/lib/smt2scanner.cpp b/src/smt2parser/smt2scanner.cpp similarity index 100% rename from lib/smt2scanner.cpp rename to src/smt2parser/smt2scanner.cpp diff --git a/lib/smt2scanner.h b/src/smt2parser/smt2scanner.h similarity index 100% rename from lib/smt2scanner.h rename to src/smt2parser/smt2scanner.h