diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2017-09-14 14:12:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-14 14:12:22 -0500 |
| commit | ab2924e8a6cc34f29167b1ff50273d59dd7a6707 (patch) | |
| tree | d9902a389ae70a21f2d5a3f7acde2ce658fb534d /src/parser/cvc/Cvc.g | |
| parent | e4fc6c7b57668f18ce087c45e001c101375c20ea (diff) | |
Remove unhandled subtypes (#1098)
* Remove unhandled subtypes, which consequently makes typing rules uniformly stricter based on weakening the subtype relation. Ensure coercions in the smt2 and cvc parser for Real decimal constants whose type is Integer. Ensure type annotations are computed during preRewrite to ensure rewriting (which does not preserve types) does not impact term construction for parametric datatypes. This fixes issue #1048 (we now give an type exception).
* Update unit test for parametric datatypes to reflect new subtyping relation.
* Remove deprecated test.
* Make array construction for lambdas work with new subtype relations to handle lambdas like (lambda ((x Int) (y Int)) (ite (= x 0) 0.5 0.0)).
Diffstat (limited to 'src/parser/cvc/Cvc.g')
| -rw-r--r-- | src/parser/cvc/Cvc.g | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/parser/cvc/Cvc.g b/src/parser/cvc/Cvc.g index 6cc5c29a4..d0324cc45 100644 --- a/src/parser/cvc/Cvc.g +++ b/src/parser/cvc/Cvc.g @@ -2104,7 +2104,12 @@ simpleTerm[CVC4::Expr& f] /* syntactic predicate: never match INTEGER.DIGIT as an integer and a dot! * This is a rational constant! Otherwise the parser interprets it as a tuple * selector! */ - | DECIMAL_LITERAL { f = MK_CONST(AntlrInput::tokenToRational($DECIMAL_LITERAL)); } + | DECIMAL_LITERAL { + f = MK_CONST(AntlrInput::tokenToRational($DECIMAL_LITERAL)); + if(f.getType().isInteger()) { + f = MK_EXPR(kind::TO_REAL, f); + } + } | INTEGER_LITERAL { f = MK_CONST(AntlrInput::tokenToInteger($INTEGER_LITERAL)); } /* bitvector literals */ | HEX_LITERAL |