diff options
author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-07-03 17:13:31 -0400 |
---|---|---|
committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-11-27 17:55:53 -0500 |
commit | a97891f9cc892fdc261cd4e3d3229ec68f05b45e (patch) | |
tree | a05c30ddbe81d9dd084a2e024875f829d6f1f3a7 /src/util | |
parent | b28a42c3a4fd8c9b079b157ad8ff36e581b60d29 (diff) |
General pre-release cleanup commit
* Rename {model,util_model}.{h,cpp} files to match class names
* Fix alreadyVisited() issue in TheoryEngine
* Remove spurious Message that causes compliance issues
* Update copyrights, fix public/private markings in headers
* minor comment fixes
* remove EXTRACT_OP as a special-case in typechecker
* note about rewriters in theoryskel readme
* Clean up some compiler warnings
* Code typos and spacing
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/Makefile.am | 4 | ||||
-rw-r--r-- | src/util/model.cpp (renamed from src/util/util_model.cpp) | 4 | ||||
-rw-r--r-- | src/util/model.h (renamed from src/util/util_model.h) | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 5b8da8828..2f278625a 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -87,8 +87,8 @@ libutil_la_SOURCES = \ abstract_value.cpp \ array_store_all.h \ array_store_all.cpp \ - util_model.h \ - util_model.cpp \ + model.h \ + model.cpp \ sort_inference.h \ sort_inference.cpp \ regexp.h diff --git a/src/util/util_model.cpp b/src/util/model.cpp index 1c2dc2edf..1d14a7c4f 100644 --- a/src/util/util_model.cpp +++ b/src/util/model.cpp @@ -1,5 +1,5 @@ /********************* */ -/*! \file util_model.cpp +/*! \file model.cpp ** \verbatim ** Original author: Clark Barrett ** Major contributors: Morgan Deters @@ -12,7 +12,7 @@ ** \brief implementation of Model class **/ -#include "util/util_model.h" +#include "util/model.h" #include "expr/command.h" #include "smt/smt_engine_scope.h" #include "smt/command_list.h" diff --git a/src/util/util_model.h b/src/util/model.h index e5bd1f955..2224f74db 100644 --- a/src/util/util_model.h +++ b/src/util/model.h @@ -1,5 +1,5 @@ /********************* */ -/*! \file util_model.h +/*! \file model.h ** \verbatim ** Original author: Clark Barrett ** Major contributors: Andrew Reynolds, Morgan Deters @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__UTIL_MODEL_H -#define __CVC4__UTIL_MODEL_H +#ifndef __CVC4__MODEL_H +#define __CVC4__MODEL_H #include <iostream> #include <vector> @@ -75,4 +75,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__UTIL_MODEL_H */ +#endif /* __CVC4__MODEL_H */ |