diff options
author | Morgan Deters <mdeters@gmail.com> | 2010-02-27 23:43:24 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2010-02-27 23:43:24 +0000 |
commit | 0eb82499822544f96877f317bbbcd4cb7c644614 (patch) | |
tree | 7abbd631cb9c5e065883f9eb8babccc62a9fbb00 /src/theory | |
parent | e56c41f47d43103a6e8bf744e12229ed6e5a8f19 (diff) |
A bag of unrelated fixes to bring trunk more in-line with recent
policy discussion (no dead code, no unimplemented unit tests...), and
other fixes:
* src/expr/node_builder.h: uncomment AndNodeBuilder, OrNodeBuilder,
PlusNodeBuilder, and MultNodeBuilder. (These had been dead code for
awhile.)
* src/expr/node_value.cpp: toString() is much more reasonable now,
printing S-exprs and using variable names (instead of printing raw
pointer values). Next, we'll want to define a pretty-printing
theory interface and perhaps hook this up to that.
* test/unit/expr/node_black.h: implement testIterator(),
testToString(), and testToStream().
* test/unit/expr/node_builder_black.h: implement testIterator() and
testAppend(), and add some code to avoid the warnings on clear() for
unused NodeBuilders.
* src/expr/node_builder.h: redefine "iterator" to be over Nodes rather
than over NodeValues. Doesn't make sense to expose the underlying
NodeValues. This shouldn't affect anyone, no one was using
NodeBuilder iterators.
* fix some comments in source code
Diffstat (limited to 'src/theory')
-rw-r--r-- | src/theory/arith/kinds | 2 | ||||
-rw-r--r-- | src/theory/theoryof_table_epilogue.h | 3 | ||||
-rw-r--r-- | src/theory/theoryof_table_middle.h | 3 | ||||
-rw-r--r-- | src/theory/theoryof_table_prologue.h | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/src/theory/arith/kinds b/src/theory/arith/kinds index 994416838..fd784ccce 100644 --- a/src/theory/arith/kinds +++ b/src/theory/arith/kinds @@ -1 +1,3 @@ PLUS +MULT +UMINUS diff --git a/src/theory/theoryof_table_epilogue.h b/src/theory/theoryof_table_epilogue.h index 7483248ec..11f75183a 100644 --- a/src/theory/theoryof_table_epilogue.h +++ b/src/theory/theoryof_table_epilogue.h @@ -10,7 +10,8 @@ ** See the file COPYING in the top-level source directory for licensing ** information. ** - ** The theoryOf table. + ** The epilogue section for the automatically-generated theoryOf table. + ** See the mktheoryof script. **/ };/* class TheoryOfTable */ diff --git a/src/theory/theoryof_table_middle.h b/src/theory/theoryof_table_middle.h index 17a945d01..f3ad433a3 100644 --- a/src/theory/theoryof_table_middle.h +++ b/src/theory/theoryof_table_middle.h @@ -10,7 +10,8 @@ ** See the file COPYING in the top-level source directory for licensing ** information. ** - ** The theoryOf table. + ** The middle section for the automatically-generated theoryOf table. + ** See the mktheoryof script. **/ namespace CVC4 { diff --git a/src/theory/theoryof_table_prologue.h b/src/theory/theoryof_table_prologue.h index 47fd2d9b2..6e83d6d2c 100644 --- a/src/theory/theoryof_table_prologue.h +++ b/src/theory/theoryof_table_prologue.h @@ -10,7 +10,8 @@ ** See the file COPYING in the top-level source directory for licensing ** information. ** - ** The theoryOf table. + ** The prologue section for the automatically-generated theoryOf table. + ** See the mktheoryof script. **/ #include "cvc4_private.h" |