From 4a696409769044ad155a56eeb00c9d85246ca0b4 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Fri, 3 Jun 2011 05:30:54 +0000 Subject: datatypes work --- src/parser/cvc/Cvc.g | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/parser') diff --git a/src/parser/cvc/Cvc.g b/src/parser/cvc/Cvc.g index ca006daab..d6165b435 100644 --- a/src/parser/cvc/Cvc.g +++ b/src/parser/cvc/Cvc.g @@ -1462,8 +1462,14 @@ postfixTerm[CVC4::Expr& f] )*/ )* ( typeAscription[f, t] - { if(t.isDatatype()) { - f = MK_EXPR(CVC4::kind::APPLY_TYPE_ASCRIPTION, MK_CONST(AscriptionType(t)), f); + { if(f.getKind() == CVC4::kind::APPLY_CONSTRUCTOR && t.isDatatype()) { + std::vector v; + Expr e = f.getOperator(); + const Datatype::Constructor& dtc = Datatype::datatypeOf(e)[Datatype::indexOf(e)]; + v.push_back(MK_EXPR( CVC4::kind::APPLY_TYPE_ASCRIPTION, + MK_CONST(AscriptionType(dtc.getSpecializedConstructorType(t))), f.getOperator()[0] )); + v.insert(v.end(), f.begin(), f.end()); + f = MK_EXPR(CVC4::kind::APPLY_CONSTRUCTOR, v); } else { if(f.getType() != t) { PARSER_STATE->parseError("Type ascription not satisfied."); -- cgit v1.2.3