diff options
author | Morgan Deters <mdeters@gmail.com> | 2012-11-27 02:13:38 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2012-11-27 02:13:38 +0000 |
commit | b122cec27ca27d0b48e786191448e0053be78ed0 (patch) | |
tree | 615981d8623e830894f02fc528b173ac7461f934 /src/expr/mkexpr | |
parent | 3da16da97df7cd2efd4b113db3bfef8b9c138ebe (diff) |
Tuples and records merge. Resolves bug 270.
Also some fixes to parametric datatypes I found, and fixes for a handful of bugs, including some observed with --check-models --incremental on together.
(this commit was certified error- and warning-free by the test-and-commit script.)
Diffstat (limited to 'src/expr/mkexpr')
-rwxr-xr-x | src/expr/mkexpr | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/expr/mkexpr b/src/expr/mkexpr index 28a47d84d..ec8d0d12f 100755 --- a/src/expr/mkexpr +++ b/src/expr/mkexpr @@ -136,7 +136,9 @@ function typerule { lineno=${BASH_LINENO[0]} check_theory_seen typerules="${typerules} +#line $lineno \"$kf\" case kind::$1: +#line $lineno \"$kf\" typeNode = $2::computeType(nodeManager, n, check); break; " @@ -147,7 +149,9 @@ function construle { lineno=${BASH_LINENO[0]} check_theory_seen construles="${construles} +#line $lineno \"$kf\" case kind::$1: +#line $lineno \"$kf\" return $2::computeIsConst(nodeManager, n); " } |