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/expr | |
| 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/expr')
| -rw-r--r-- | src/expr/command.cpp | 2 | ||||
| -rw-r--r-- | src/expr/type_checker_template.cpp | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/expr/command.cpp b/src/expr/command.cpp index 8ae448657..3d5cec19b 100644 --- a/src/expr/command.cpp +++ b/src/expr/command.cpp @@ -29,7 +29,7 @@ #include "util/output.h" #include "util/dump.h" #include "util/sexpr.h" -#include "util/util_model.h" +#include "util/model.h" #include "expr/node.h" #include "printer/printer.h" diff --git a/src/expr/type_checker_template.cpp b/src/expr/type_checker_template.cpp index 4e476f4d9..cf72d4e4e 100644 --- a/src/expr/type_checker_template.cpp +++ b/src/expr/type_checker_template.cpp @@ -40,13 +40,10 @@ TypeNode TypeChecker::computeType(NodeManager* nodeManager, TNode n, bool check) case kind::BUILTIN: typeNode = nodeManager->builtinOperatorType(); break; - case kind::BITVECTOR_EXTRACT_OP : - typeNode = nodeManager->builtinOperatorType(); - break; ${typerules} -#line 50 "${template}" +#line 47 "${template}" default: Debug("getType") << "FAILURE" << std::endl; @@ -69,7 +66,7 @@ bool TypeChecker::computeIsConst(NodeManager* nodeManager, TNode n) switch(n.getKind()) { ${construles} -#line 73 "${template}" +#line 70 "${template}" default:; } |