summaryrefslogtreecommitdiff
path: root/src/expr
diff options
context:
space:
mode:
authorMorgan Deters <mdeters@gmail.com>2012-11-12 18:34:32 +0000
committerMorgan Deters <mdeters@gmail.com>2012-11-12 18:34:32 +0000
commit1c2c416b953309279c43c86a46b5690642ff95dd (patch)
tree3cee55cb762199ca28aeceaa589431c064459748 /src/expr
parent0ba075e240b2083163ab35a3580547cae6927b6c (diff)
* Fix language bindings: various issues
** remove a number of warnings in bindings generation ** give appropriate names for operator-overloading ** make sure Java language bindings are built with -fno-strict-aliasing, to ensure the optimizer doesn't produce bad code * Also remove BitVector::equals(), which wasn't used and was inconsistently implemented (operator==() is still there). (this commit was certified error- and warning-free by the test-and-commit script.)
Diffstat (limited to 'src/expr')
-rw-r--r--src/expr/command.h1
-rw-r--r--src/expr/type.i4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/expr/command.h b/src/expr/command.h
index b0a7ddb36..342aec5ff 100644
--- a/src/expr/command.h
+++ b/src/expr/command.h
@@ -320,6 +320,7 @@ protected:
public:
DeclarationDefinitionCommand(const std::string& id) throw();
~DeclarationDefinitionCommand() throw() {}
+ virtual void invoke(SmtEngine* smtEngine) throw() = 0;
std::string getSymbol() const throw();
};/* class DeclarationDefinitionCommand */
diff --git a/src/expr/type.i b/src/expr/type.i
index 0646ec8cd..870cb228c 100644
--- a/src/expr/type.i
+++ b/src/expr/type.i
@@ -21,6 +21,7 @@
%rename(toBitVectorType) CVC4::Type::operator BitVectorType() const;
%rename(toFunctionType) CVC4::Type::operator FunctionType() const;
%rename(toTupleType) CVC4::Type::operator TupleType() const;
+%rename(toSExprType) CVC4::Type::operator SExprType() const;
%rename(toArrayType) CVC4::Type::operator ArrayType() const;
%rename(toDatatypeType) CVC4::Type::operator DatatypeType() const;
%rename(toConstructorType) CVC4::Type::operator ConstructorType() const;
@@ -28,7 +29,8 @@
%rename(toTesterType) CVC4::Type::operator TesterType() const;
%rename(toSortType) CVC4::Type::operator SortType() const;
%rename(toSortConstructorType) CVC4::Type::operator SortConstructorType() const;
-%rename(toKindType) CVC4::Type::operator KindType() const;
+%rename(toPredicateSubtype) CVC4::Type::operator PredicateSubtype() const;
+%rename(toSubrangeType) CVC4::Type::operator SubrangeType() const;
namespace CVC4 {
namespace expr {
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback