From fbdd4ce5f6e11cd61acfea2e4338a1ec00a51012 Mon Sep 17 00:00:00 2001 From: Levent Erkok Date: Mon, 16 Sep 2024 17:17:29 -0700 Subject: [PATCH] update golds --- .../barrelRotate_Left_Int16_Word16.gold | 3 - .../barrelRotate_Left_Int16_Word32.gold | 3 - .../barrelRotate_Left_Int16_Word64.gold | 3 - .../barrelRotate_Left_Int16_Word8.gold | 3 - .../barrelRotate_Left_Int32_Word16.gold | 3 - .../barrelRotate_Left_Int32_Word32.gold | 3 - .../barrelRotate_Left_Int32_Word64.gold | 3 - .../barrelRotate_Left_Int32_Word8.gold | 3 - .../barrelRotate_Left_Int64_Word16.gold | 3 - .../barrelRotate_Left_Int64_Word32.gold | 3 - .../barrelRotate_Left_Int64_Word64.gold | 3 - .../barrelRotate_Left_Int64_Word8.gold | 3 - .../barrelRotate_Left_Int8_Word16.gold | 3 - .../barrelRotate_Left_Int8_Word32.gold | 3 - .../barrelRotate_Left_Int8_Word64.gold | 3 - .../barrelRotate_Left_Int8_Word8.gold | 3 - .../barrelRotate_Left_Word16_Word16.gold | 3 - .../barrelRotate_Left_Word16_Word32.gold | 3 - .../barrelRotate_Left_Word16_Word64.gold | 3 - .../barrelRotate_Left_Word16_Word8.gold | 3 - .../barrelRotate_Left_Word32_Word16.gold | 3 - .../barrelRotate_Left_Word32_Word32.gold | 3 - .../barrelRotate_Left_Word32_Word64.gold | 3 - .../barrelRotate_Left_Word32_Word8.gold | 3 - .../barrelRotate_Left_Word64_Word16.gold | 3 - .../barrelRotate_Left_Word64_Word32.gold | 3 - .../barrelRotate_Left_Word64_Word64.gold | 3 - .../barrelRotate_Left_Word64_Word8.gold | 3 - .../barrelRotate_Left_Word8_Word16.gold | 3 - .../barrelRotate_Left_Word8_Word32.gold | 3 - .../barrelRotate_Left_Word8_Word64.gold | 3 - .../barrelRotate_Left_Word8_Word8.gold | 3 - .../barrelRotate_Right_Int16_Word16.gold | 3 - .../barrelRotate_Right_Int16_Word32.gold | 3 - .../barrelRotate_Right_Int16_Word64.gold | 3 - .../barrelRotate_Right_Int16_Word8.gold | 3 - .../barrelRotate_Right_Int32_Word16.gold | 3 - .../barrelRotate_Right_Int32_Word32.gold | 3 - .../barrelRotate_Right_Int32_Word64.gold | 3 - .../barrelRotate_Right_Int32_Word8.gold | 3 - .../barrelRotate_Right_Int64_Word16.gold | 3 - .../barrelRotate_Right_Int64_Word32.gold | 3 - .../barrelRotate_Right_Int64_Word64.gold | 3 - .../barrelRotate_Right_Int64_Word8.gold | 3 - .../barrelRotate_Right_Int8_Word16.gold | 3 - .../barrelRotate_Right_Int8_Word32.gold | 3 - .../barrelRotate_Right_Int8_Word64.gold | 3 - .../barrelRotate_Right_Int8_Word8.gold | 3 - .../barrelRotate_Right_Word16_Word16.gold | 3 - .../barrelRotate_Right_Word16_Word32.gold | 3 - .../barrelRotate_Right_Word16_Word64.gold | 3 - .../barrelRotate_Right_Word16_Word8.gold | 3 - .../barrelRotate_Right_Word32_Word16.gold | 3 - .../barrelRotate_Right_Word32_Word32.gold | 3 - .../barrelRotate_Right_Word32_Word64.gold | 3 - .../barrelRotate_Right_Word32_Word8.gold | 3 - .../barrelRotate_Right_Word64_Word16.gold | 3 - .../barrelRotate_Right_Word64_Word32.gold | 3 - .../barrelRotate_Right_Word64_Word64.gold | 3 - .../barrelRotate_Right_Word64_Word8.gold | 3 - .../barrelRotate_Right_Word8_Word16.gold | 3 - .../barrelRotate_Right_Word8_Word32.gold | 3 - .../barrelRotate_Right_Word8_Word64.gold | 3 - .../barrelRotate_Right_Word8_Word8.gold | 3 - SBVTestSuite/GoldFiles/basic-2_1.gold | 1 - SBVTestSuite/GoldFiles/basic-2_2.gold | 1 - SBVTestSuite/GoldFiles/basic-2_3.gold | 1 - SBVTestSuite/GoldFiles/basic-2_4.gold | 1 - SBVTestSuite/GoldFiles/basic-3_1.gold | 1 - SBVTestSuite/GoldFiles/basic-3_2.gold | 1 - SBVTestSuite/GoldFiles/basic-3_3.gold | 1 - SBVTestSuite/GoldFiles/basic-3_4.gold | 1 - SBVTestSuite/GoldFiles/basic-3_5.gold | 1 - SBVTestSuite/GoldFiles/basic-4_1.gold | 1 - SBVTestSuite/GoldFiles/basic-4_2.gold | 1 - SBVTestSuite/GoldFiles/basic-4_3.gold | 1 - SBVTestSuite/GoldFiles/basic-4_4.gold | 1 - SBVTestSuite/GoldFiles/basic-4_5.gold | 1 - SBVTestSuite/GoldFiles/basic-5_1.gold | 1 - SBVTestSuite/GoldFiles/basic-5_2.gold | 1 - SBVTestSuite/GoldFiles/basic-5_3.gold | 1 - SBVTestSuite/GoldFiles/basic-5_4.gold | 1 - SBVTestSuite/GoldFiles/basic-5_5.gold | 1 - SBVTestSuite/GoldFiles/check1.gold | 3 - SBVTestSuite/GoldFiles/check2.gold | 8 +- SBVTestSuite/GoldFiles/concreteFoldl.gold | 3 - SBVTestSuite/GoldFiles/concreteFoldr.gold | 3 - SBVTestSuite/GoldFiles/concreteReverse.gold | 3 - SBVTestSuite/GoldFiles/exceptionLocal1.gold | 1 - SBVTestSuite/GoldFiles/foldlABC1.gold | 3 - SBVTestSuite/GoldFiles/foldlABC2.gold | 3 - SBVTestSuite/GoldFiles/foldlABC3.gold | 3 - SBVTestSuite/GoldFiles/foldrAB1.gold | 3 - SBVTestSuite/GoldFiles/foldrAB2.gold | 3 - SBVTestSuite/GoldFiles/foldrAB3.gold | 3 - SBVTestSuite/GoldFiles/genBenchMark1.gold | 3 - SBVTestSuite/GoldFiles/genBenchMark2.gold | 3 - SBVTestSuite/GoldFiles/lambda02.gold | 6 +- SBVTestSuite/GoldFiles/lambda03.gold | 8 +- SBVTestSuite/GoldFiles/lambda04.gold | 5 +- SBVTestSuite/GoldFiles/lambda05.gold | 15 ++- SBVTestSuite/GoldFiles/lambda06.gold | 41 ++++---- SBVTestSuite/GoldFiles/lambda07.gold | 9 +- SBVTestSuite/GoldFiles/lambda08.gold | 9 +- SBVTestSuite/GoldFiles/lambda09.gold | 9 +- SBVTestSuite/GoldFiles/lambda10.gold | 9 +- SBVTestSuite/GoldFiles/lambda11.gold | 9 +- SBVTestSuite/GoldFiles/lambda12.gold | 3 - SBVTestSuite/GoldFiles/lambda13.gold | 11 +-- SBVTestSuite/GoldFiles/lambda14.gold | 3 - SBVTestSuite/GoldFiles/lambda15.gold | 3 - SBVTestSuite/GoldFiles/lambda16.gold | 3 - SBVTestSuite/GoldFiles/lambda17.gold | 9 +- SBVTestSuite/GoldFiles/lambda18.gold | 9 +- SBVTestSuite/GoldFiles/lambda19.gold | 9 +- SBVTestSuite/GoldFiles/lambda20.gold | 9 +- SBVTestSuite/GoldFiles/lambda21.gold | 15 ++- SBVTestSuite/GoldFiles/lambda22.gold | 13 +-- SBVTestSuite/GoldFiles/lambda23.gold | 27 +++-- SBVTestSuite/GoldFiles/lambda24.gold | 13 +-- SBVTestSuite/GoldFiles/lambda25.gold | 19 ++-- SBVTestSuite/GoldFiles/lambda26.gold | 3 - SBVTestSuite/GoldFiles/lambda27.gold | 45 ++++----- SBVTestSuite/GoldFiles/lambda28.gold | 45 ++++----- SBVTestSuite/GoldFiles/lambda29.gold | 45 ++++----- SBVTestSuite/GoldFiles/lambda30.gold | 45 ++++----- SBVTestSuite/GoldFiles/lambda31.gold | 51 +++++----- SBVTestSuite/GoldFiles/lambda32.gold | 51 +++++----- SBVTestSuite/GoldFiles/lambda34.gold | 6 +- SBVTestSuite/GoldFiles/lambda36.gold | 2 +- SBVTestSuite/GoldFiles/lambda38.gold | 8 +- SBVTestSuite/GoldFiles/lambda41.gold | 6 +- SBVTestSuite/GoldFiles/lambda44.gold | 6 +- SBVTestSuite/GoldFiles/lambda46.gold | 9 +- SBVTestSuite/GoldFiles/lambda47.gold | 19 ++-- SBVTestSuite/GoldFiles/lambda47_c.gold | 3 - SBVTestSuite/GoldFiles/lambda48.gold | 23 ++--- SBVTestSuite/GoldFiles/lambda48_c.gold | 3 - SBVTestSuite/GoldFiles/lambda49.gold | 33 +++---- SBVTestSuite/GoldFiles/lambda49_c.gold | 3 - SBVTestSuite/GoldFiles/lambda50.gold | 33 +++---- SBVTestSuite/GoldFiles/lambda50_c.gold | 7 +- SBVTestSuite/GoldFiles/lambda51.gold | 33 +++---- SBVTestSuite/GoldFiles/lambda51_c.gold | 7 +- SBVTestSuite/GoldFiles/lambda52.gold | 33 +++---- SBVTestSuite/GoldFiles/lambda52_c.gold | 3 - SBVTestSuite/GoldFiles/lambda53.gold | 3 - SBVTestSuite/GoldFiles/lambda54.gold | 17 ++-- SBVTestSuite/GoldFiles/lambda55.gold | 17 ++-- SBVTestSuite/GoldFiles/lambda56.gold | 19 ++-- SBVTestSuite/GoldFiles/lambda57.gold | 99 +++++++++---------- SBVTestSuite/GoldFiles/lambda58.gold | 6 +- SBVTestSuite/GoldFiles/lambda59.gold | 8 +- SBVTestSuite/GoldFiles/lambda60.gold | 9 +- SBVTestSuite/GoldFiles/lambda61.gold | 3 - SBVTestSuite/GoldFiles/lambda62.gold | 11 +-- SBVTestSuite/GoldFiles/lambda63.gold | 3 - SBVTestSuite/GoldFiles/lambda64.gold | 11 +-- SBVTestSuite/GoldFiles/lambda65.gold | 11 +-- SBVTestSuite/GoldFiles/lambda66.gold | 23 ++--- SBVTestSuite/GoldFiles/lambda67.gold | 23 ++--- SBVTestSuite/GoldFiles/lambda68.gold | 17 ++-- SBVTestSuite/GoldFiles/lambda69.gold | 19 ++-- SBVTestSuite/GoldFiles/lambda70.gold | 41 ++++---- SBVTestSuite/GoldFiles/lambda71.gold | 16 +-- SBVTestSuite/GoldFiles/lambda72.gold | 8 +- SBVTestSuite/GoldFiles/lambda73.gold | 6 +- SBVTestSuite/GoldFiles/lambda74.gold | 16 +-- SBVTestSuite/GoldFiles/lambda75.gold | 16 +-- SBVTestSuite/GoldFiles/lambda79.gold | 14 +-- SBVTestSuite/GoldFiles/lambda80.gold | 20 ++-- SBVTestSuite/GoldFiles/mapNoFailure.gold | 3 - SBVTestSuite/GoldFiles/mapWithFailure.gold | 3 - SBVTestSuite/GoldFiles/maxlWithFailure.gold | 3 - SBVTestSuite/GoldFiles/maxrWithFailure.gold | 3 - SBVTestSuite/GoldFiles/pbAtLeast.gold | 3 - SBVTestSuite/GoldFiles/pbAtMost.gold | 3 - SBVTestSuite/GoldFiles/pbEq.gold | 3 - SBVTestSuite/GoldFiles/pbEq2.gold | 11 +-- SBVTestSuite/GoldFiles/pbExactly.gold | 3 - SBVTestSuite/GoldFiles/pbGe.gold | 3 - SBVTestSuite/GoldFiles/pbLe.gold | 3 - SBVTestSuite/GoldFiles/pbMutexed.gold | 3 - SBVTestSuite/GoldFiles/pbStronglyMutexed.gold | 3 - SBVTestSuite/GoldFiles/qUninterp1.gold | 3 - SBVTestSuite/GoldFiles/quantifiedB_0.gold | 37 ++++--- SBVTestSuite/GoldFiles/quantifiedB_1.gold | 15 ++- SBVTestSuite/GoldFiles/quantifiedB_2.gold | 13 +-- SBVTestSuite/GoldFiles/quantifiedB_3.gold | 13 +-- SBVTestSuite/GoldFiles/quantifiedB_4.gold | 13 +-- SBVTestSuite/GoldFiles/quantifiedB_5.gold | 13 +-- SBVTestSuite/GoldFiles/quantifiedB_6.gold | 5 +- SBVTestSuite/GoldFiles/quantifiedB_7.gold | 6 +- SBVTestSuite/GoldFiles/quantifiedB_8.gold | 6 +- SBVTestSuite/GoldFiles/quantifiedB_9.gold | 6 +- SBVTestSuite/GoldFiles/quantifiedB_A.gold | 15 ++- SBVTestSuite/GoldFiles/quantifiedB_B.gold | 15 ++- ...ed_prove_existsexists_contradiction_p.gold | 11 +-- ...fied_prove_existsexists_satisfiable_p.gold | 11 +-- .../quantified_prove_existsexists_thm_p.gold | 11 +-- ...ed_prove_existsforall_contradiction_p.gold | 11 +-- ...fied_prove_existsforall_satisfiable_p.gold | 11 +-- .../quantified_prove_existsforall_thm_p.gold | 11 +-- ...ed_prove_forallexists_contradiction_p.gold | 11 +-- ...fied_prove_forallexists_satisfiable_p.gold | 11 +-- .../quantified_prove_forallexists_thm_p.gold | 11 +-- ...ed_prove_forallforall_contradiction_p.gold | 11 +-- ...fied_prove_forallforall_satisfiable_p.gold | 11 +-- .../quantified_prove_forallforall_thm_p.gold | 11 +-- ...fied_sat_existsexists_contradiction_c.gold | 11 +-- ...fied_sat_existsexists_contradiction_p.gold | 11 +-- ...tified_sat_existsexists_satisfiable_c.gold | 11 +-- ...tified_sat_existsexists_satisfiable_p.gold | 11 +-- .../quantified_sat_existsexists_thm_c.gold | 11 +-- .../quantified_sat_existsexists_thm_p.gold | 11 +-- ...fied_sat_existsforall_contradiction_c.gold | 11 +-- ...fied_sat_existsforall_contradiction_p.gold | 11 +-- ...tified_sat_existsforall_satisfiable_c.gold | 11 +-- ...tified_sat_existsforall_satisfiable_p.gold | 11 +-- .../quantified_sat_existsforall_thm_c.gold | 11 +-- .../quantified_sat_existsforall_thm_p.gold | 11 +-- ...fied_sat_forallexists_contradiction_c.gold | 11 +-- ...fied_sat_forallexists_contradiction_p.gold | 11 +-- ...tified_sat_forallexists_satisfiable_c.gold | 11 +-- ...tified_sat_forallexists_satisfiable_p.gold | 11 +-- .../quantified_sat_forallexists_thm_c.gold | 11 +-- .../quantified_sat_forallexists_thm_p.gold | 11 +-- ...fied_sat_forallforall_contradiction_c.gold | 11 +-- ...fied_sat_forallforall_contradiction_p.gold | 11 +-- ...tified_sat_forallforall_satisfiable_c.gold | 11 +-- ...tified_sat_forallforall_satisfiable_p.gold | 11 +-- .../quantified_sat_forallforall_thm_c.gold | 11 +-- .../quantified_sat_forallforall_thm_p.gold | 11 +-- SBVTestSuite/GoldFiles/query_Chars1.gold | 3 - .../GoldFiles/query_Interpolant1.gold | 3 - .../GoldFiles/query_Interpolant2.gold | 3 - .../GoldFiles/query_Interpolant3.gold | 3 - .../GoldFiles/query_Interpolant4.gold | 3 - SBVTestSuite/GoldFiles/query_ListOfMaybe.gold | 3 - SBVTestSuite/GoldFiles/query_ListOfSum.gold | 3 - SBVTestSuite/GoldFiles/query_Lists1.gold | 3 - SBVTestSuite/GoldFiles/query_Maybe.gold | 3 - SBVTestSuite/GoldFiles/query_Strings1.gold | 3 - .../GoldFiles/query_SumMaybeBoth.gold | 3 - SBVTestSuite/GoldFiles/query_Sums.gold | 3 - SBVTestSuite/GoldFiles/query_Tuples1.gold | 3 - SBVTestSuite/GoldFiles/query_Tuples2.gold | 3 - SBVTestSuite/GoldFiles/query_abc.gold | 3 - SBVTestSuite/GoldFiles/query_bitwuzla.gold | 3 - SBVTestSuite/GoldFiles/query_boolector.gold | 3 - SBVTestSuite/GoldFiles/query_cvc4.gold | 3 - SBVTestSuite/GoldFiles/query_cvc5.gold | 3 - SBVTestSuite/GoldFiles/query_mathsat.gold | 3 - .../GoldFiles/query_sumMergeEither1.gold | 3 - .../GoldFiles/query_sumMergeEither2.gold | 3 - .../GoldFiles/query_sumMergeMaybe1.gold | 3 - .../GoldFiles/query_sumMergeMaybe2.gold | 3 - SBVTestSuite/GoldFiles/query_uiSat_test1.gold | 5 +- SBVTestSuite/GoldFiles/query_uiSat_test2.gold | 5 +- SBVTestSuite/GoldFiles/query_uisatex1.gold | 3 - SBVTestSuite/GoldFiles/query_uisatex3.gold | 13 +-- SBVTestSuite/GoldFiles/query_yices.gold | 3 - SBVTestSuite/GoldFiles/query_z3.gold | 3 - SBVTestSuite/GoldFiles/reverse.gold | 3 - SBVTestSuite/GoldFiles/reverseAlt10.gold | 3 - SBVTestSuite/GoldFiles/safe1.gold | 3 - SBVTestSuite/GoldFiles/safe2.gold | 3 - SBVTestSuite/GoldFiles/seqConcat.gold | 3 - SBVTestSuite/GoldFiles/seqConcatBad.gold | 3 - SBVTestSuite/GoldFiles/seqExamples1.gold | 3 - SBVTestSuite/GoldFiles/seqExamples2.gold | 3 - SBVTestSuite/GoldFiles/seqExamples3.gold | 3 - SBVTestSuite/GoldFiles/seqExamples4.gold | 3 - SBVTestSuite/GoldFiles/seqExamples5.gold | 3 - SBVTestSuite/GoldFiles/seqExamples6.gold | 3 - SBVTestSuite/GoldFiles/seqExamples7.gold | 3 - SBVTestSuite/GoldFiles/seqExamples8.gold | 3 - SBVTestSuite/GoldFiles/seqIndexOf.gold | 3 - SBVTestSuite/GoldFiles/seqIndexOfBad.gold | 3 - SBVTestSuite/GoldFiles/set_compl1.gold | 3 - SBVTestSuite/GoldFiles/set_delete1.gold | 3 - SBVTestSuite/GoldFiles/set_diff1.gold | 3 - SBVTestSuite/GoldFiles/set_insert1.gold | 3 - SBVTestSuite/GoldFiles/set_intersect1.gold | 3 - SBVTestSuite/GoldFiles/set_member1.gold | 3 - SBVTestSuite/GoldFiles/set_notMember1.gold | 3 - SBVTestSuite/GoldFiles/set_psubset1.gold | 45 ++++----- SBVTestSuite/GoldFiles/set_subset1.gold | 3 - SBVTestSuite/GoldFiles/set_tupleSet.gold | 3 - SBVTestSuite/GoldFiles/set_uninterp2.gold | 3 - SBVTestSuite/GoldFiles/set_union1.gold | 3 - SBVTestSuite/GoldFiles/sort.gold | 3 - SBVTestSuite/GoldFiles/sumBimapPlus.gold | 3 - SBVTestSuite/GoldFiles/validate_0.gold | 3 - SBVTestSuite/GoldFiles/validate_1.gold | 3 - SBVTestSuite/GoldFiles/validate_2.gold | 3 - SBVTestSuite/GoldFiles/validate_5.gold | 3 - SBVTestSuite/GoldFiles/validate_6.gold | 3 - SBVTestSuite/GoldFiles/validate_7.gold | 17 ++-- 299 files changed, 773 insertions(+), 1578 deletions(-) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word16.gold index 1d24336f5..889401d98 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_left 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x0010 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word32.gold index 81afd2edf..e55da024d 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_left 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x00000010 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word64.gold index 014d9f55c..f90d1e7ec 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_left 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x0000000000000010 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word8.gold index 6f5a02aae..96c09f971 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int16_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_left 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x10 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word16.gold index bcb103b4e..192d080bd 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_left 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x0020 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word32.gold index 4d6da5250..fc055f013 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_left 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x00000020 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word64.gold index 237ec3625..ed0ba7f93 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_left 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x0000000000000020 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word8.gold index 2dbd6a1f9..9c51d414b 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int32_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_left 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x20 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word16.gold index c67aec505..8aae2c780 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_left 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x0040 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word32.gold index a986c749f..d06f431a9 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_left 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x00000040 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word64.gold index 2ceab2f41..ad2efb49a 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_left 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x0000000000000040 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word8.gold index 9a19a52d0..dfc6687ee 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int64_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_left 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x40 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word16.gold index 1d9df95d1..f101317d1 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_left 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x0008 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s11)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word32.gold index 97b6ad9d0..09ff08087 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_left 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x00000008 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s11)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word64.gold index 790f1e1ff..523f0ce47 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_left 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x0000000000000008 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s11)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word8.gold index ef11fca96..db31c959e 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Int8_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_left 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x08 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s11)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word16.gold index 1d24336f5..889401d98 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_left 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x0010 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word32.gold index 81afd2edf..e55da024d 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_left 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x00000010 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word64.gold index 014d9f55c..f90d1e7ec 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_left 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x0000000000000010 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word8.gold index 6f5a02aae..96c09f971 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word16_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_left 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x10 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word16.gold index bcb103b4e..192d080bd 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_left 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x0020 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word32.gold index 4d6da5250..fc055f013 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_left 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x00000020 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word64.gold index 237ec3625..ed0ba7f93 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_left 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x0000000000000020 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word8.gold index 2dbd6a1f9..9c51d414b 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word32_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_left 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x20 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word16.gold index c67aec505..8aae2c780 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_left 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x0040 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word32.gold index a986c749f..d06f431a9 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_left 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x00000040 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word64.gold index 2ceab2f41..ad2efb49a 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_left 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x0000000000000040 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word8.gold index 9a19a52d0..dfc6687ee 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word64_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_left 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x40 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word16.gold index 1d9df95d1..f101317d1 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_left 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x0008 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s11)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word32.gold index 97b6ad9d0..09ff08087 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_left 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x00000008 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s11)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word64.gold index 790f1e1ff..523f0ce47 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_left 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x0000000000000008 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s11)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word8.gold index ef11fca96..db31c959e 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Left_Word8_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_left 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x08 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s11)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word16.gold index a0f022fdc..acc231a6b 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_right 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x0010 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word32.gold index 15395fe12..0a1a83f8b 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_right 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x00000010 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word64.gold index 4a1232689..a396bd2a1 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_right 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x0000000000000010 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word8.gold index 1e3a693bc..ea0726d3a 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int16_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_right 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x10 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word16.gold index b11bbb7b6..b283378bb 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_right 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x0020 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word32.gold index fdad4fb73..1254a0f10 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_right 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x00000020 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word64.gold index 6df2b6b3d..a75355c0a 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_right 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x0000000000000020 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word8.gold index 53cf5e5b9..22bd5d3d9 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int32_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_right 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x20 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word16.gold index ddfd0005a..6afe59874 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_right 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x0040 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word32.gold index b08aa4b81..3cf854a07 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_right 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x00000040 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word64.gold index fae2e22a5..25307bc42 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_right 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x0000000000000040 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word8.gold index 2c441b387..39e73d6d5 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int64_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_right 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x40 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word16.gold index 4bb27f05e..4e659008d 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_right 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x0008 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s11)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word32.gold index fb69e28c0..7281d8f8e 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_right 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x00000008 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s11)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word64.gold index 7e1dd6296..c0e0f915e 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_right 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x0000000000000008 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s11)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word8.gold index df18101d2..c07b792f8 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Int8_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_right 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x08 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s11)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word16.gold index a0f022fdc..acc231a6b 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_right 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x0010 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word32.gold index 15395fe12..0a1a83f8b 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_right 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x00000010 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word64.gold index 4a1232689..a396bd2a1 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_right 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x0000000000000010 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word8.gold index 1e3a693bc..ea0726d3a 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word16_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 16)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -55,8 +54,6 @@ [GOOD] (define-fun s34 () (_ BitVec 16) ((_ rotate_right 15) s0)) [GOOD] (define-fun s36 () (_ BitVec 16) (ite (bvule #x10 s3) s35 (table0 s3))) [GOOD] (define-fun s37 () Bool (= s20 s36)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s13)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word16.gold index b11bbb7b6..b283378bb 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_right 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x0020 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word32.gold index fdad4fb73..1254a0f10 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_right 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x00000020 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word64.gold index 6df2b6b3d..a75355c0a 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_right 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x0000000000000020 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word8.gold index 53cf5e5b9..22bd5d3d9 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word32_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 32)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -75,8 +74,6 @@ [GOOD] (define-fun s54 () (_ BitVec 32) ((_ rotate_right 31) s0)) [GOOD] (define-fun s56 () (_ BitVec 32) (ite (bvule #x20 s3) s55 (table0 s3))) [GOOD] (define-fun s57 () Bool (= s24 s56)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s15)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word16.gold index ddfd0005a..6afe59874 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_right 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x0040 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word32.gold index b08aa4b81..3cf854a07 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_right 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x00000040 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word64.gold index fae2e22a5..25307bc42 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_right 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x0000000000000040 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word8.gold index 2c441b387..39e73d6d5 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word64_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 64)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -111,8 +110,6 @@ [GOOD] (define-fun s90 () (_ BitVec 64) ((_ rotate_right 63) s0)) [GOOD] (define-fun s92 () (_ BitVec 64) (ite (bvule #x40 s3) s91 (table0 s3))) [GOOD] (define-fun s93 () Bool (= s28 s92)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s17)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word16.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word16.gold index 4bb27f05e..4e659008d 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word16.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word16.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 16)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_right 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x0008 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000) s0)) [GOOD] (assert (= (table0 #x0001) s11)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word32.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word32.gold index fb69e28c0..7281d8f8e 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word32.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word32.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 32)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_right 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x00000008 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00000000) s0)) [GOOD] (assert (= (table0 #x00000001) s11)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word64.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word64.gold index 7e1dd6296..c0e0f915e 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word64.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word64.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 64)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_right 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x0000000000000008 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x0000000000000000) s0)) [GOOD] (assert (= (table0 #x0000000000000001) s11)) diff --git a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word8.gold b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word8.gold index df18101d2..c07b792f8 100644 --- a/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word8.gold +++ b/SBVTestSuite/GoldFiles/barrelRotate_Right_Word8_Word8.gold @@ -18,7 +18,6 @@ [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- [GOOD] (declare-fun table0 ((_ BitVec 8)) (_ BitVec 8)) -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -43,8 +42,6 @@ [GOOD] (define-fun s22 () (_ BitVec 8) ((_ rotate_right 7) s0)) [GOOD] (define-fun s24 () (_ BitVec 8) (ite (bvule #x08 s3) s23 (table0 s3))) [GOOD] (define-fun s25 () Bool (= s16 s24)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] (assert (= (table0 #x00) s0)) [GOOD] (assert (= (table0 #x01) s11)) diff --git a/SBVTestSuite/GoldFiles/basic-2_1.gold b/SBVTestSuite/GoldFiles/basic-2_1.gold index a826f8bd5..3008c7d36 100644 --- a/SBVTestSuite/GoldFiles/basic-2_1.gold +++ b/SBVTestSuite/GoldFiles/basic-2_1.gold @@ -3,7 +3,6 @@ INPUTS CONSTANTS s1 = 3 :: Word8 TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-2_2.gold b/SBVTestSuite/GoldFiles/basic-2_2.gold index 62f210385..40f60cedb 100644 --- a/SBVTestSuite/GoldFiles/basic-2_2.gold +++ b/SBVTestSuite/GoldFiles/basic-2_2.gold @@ -3,7 +3,6 @@ INPUTS CONSTANTS s1 = 9 :: Word8 TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-2_3.gold b/SBVTestSuite/GoldFiles/basic-2_3.gold index 123596942..8c54092aa 100644 --- a/SBVTestSuite/GoldFiles/basic-2_3.gold +++ b/SBVTestSuite/GoldFiles/basic-2_3.gold @@ -3,7 +3,6 @@ INPUTS CONSTANTS s1 = 3 :: Word8 TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-2_4.gold b/SBVTestSuite/GoldFiles/basic-2_4.gold index 123596942..8c54092aa 100644 --- a/SBVTestSuite/GoldFiles/basic-2_4.gold +++ b/SBVTestSuite/GoldFiles/basic-2_4.gold @@ -3,7 +3,6 @@ INPUTS CONSTANTS s1 = 3 :: Word8 TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-3_1.gold b/SBVTestSuite/GoldFiles/basic-3_1.gold index 592f8d04a..fd384a731 100644 --- a/SBVTestSuite/GoldFiles/basic-3_1.gold +++ b/SBVTestSuite/GoldFiles/basic-3_1.gold @@ -3,7 +3,6 @@ INPUTS s1 :: SWord8, aliasing "y" CONSTANTS TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-3_2.gold b/SBVTestSuite/GoldFiles/basic-3_2.gold index dddb74d06..316af45ce 100644 --- a/SBVTestSuite/GoldFiles/basic-3_2.gold +++ b/SBVTestSuite/GoldFiles/basic-3_2.gold @@ -3,7 +3,6 @@ INPUTS s1 :: SWord8, aliasing "y" CONSTANTS TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-3_3.gold b/SBVTestSuite/GoldFiles/basic-3_3.gold index 453f34502..c438467ba 100644 --- a/SBVTestSuite/GoldFiles/basic-3_3.gold +++ b/SBVTestSuite/GoldFiles/basic-3_3.gold @@ -3,7 +3,6 @@ INPUTS s1 :: SWord8, aliasing "y" CONSTANTS TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-3_4.gold b/SBVTestSuite/GoldFiles/basic-3_4.gold index 453f34502..c438467ba 100644 --- a/SBVTestSuite/GoldFiles/basic-3_4.gold +++ b/SBVTestSuite/GoldFiles/basic-3_4.gold @@ -3,7 +3,6 @@ INPUTS s1 :: SWord8, aliasing "y" CONSTANTS TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-3_5.gold b/SBVTestSuite/GoldFiles/basic-3_5.gold index 52b2aef75..8e5287573 100644 --- a/SBVTestSuite/GoldFiles/basic-3_5.gold +++ b/SBVTestSuite/GoldFiles/basic-3_5.gold @@ -4,7 +4,6 @@ INPUTS CONSTANTS s2 = 1 :: Word8 TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-4_1.gold b/SBVTestSuite/GoldFiles/basic-4_1.gold index 529e8eb7c..aefd2bf2c 100644 --- a/SBVTestSuite/GoldFiles/basic-4_1.gold +++ b/SBVTestSuite/GoldFiles/basic-4_1.gold @@ -2,7 +2,6 @@ INPUTS s0 :: SWord8, aliasing "x" CONSTANTS TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-4_2.gold b/SBVTestSuite/GoldFiles/basic-4_2.gold index 191b0cb04..f39ebaca0 100644 --- a/SBVTestSuite/GoldFiles/basic-4_2.gold +++ b/SBVTestSuite/GoldFiles/basic-4_2.gold @@ -2,7 +2,6 @@ INPUTS s0 :: SWord8, aliasing "x" CONSTANTS TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-4_3.gold b/SBVTestSuite/GoldFiles/basic-4_3.gold index 9ff52c801..33c2d8100 100644 --- a/SBVTestSuite/GoldFiles/basic-4_3.gold +++ b/SBVTestSuite/GoldFiles/basic-4_3.gold @@ -2,7 +2,6 @@ INPUTS s0 :: SWord8, aliasing "x" CONSTANTS TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-4_4.gold b/SBVTestSuite/GoldFiles/basic-4_4.gold index 9ff52c801..33c2d8100 100644 --- a/SBVTestSuite/GoldFiles/basic-4_4.gold +++ b/SBVTestSuite/GoldFiles/basic-4_4.gold @@ -2,7 +2,6 @@ INPUTS s0 :: SWord8, aliasing "x" CONSTANTS TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-4_5.gold b/SBVTestSuite/GoldFiles/basic-4_5.gold index 1966f119d..c52afe0e0 100644 --- a/SBVTestSuite/GoldFiles/basic-4_5.gold +++ b/SBVTestSuite/GoldFiles/basic-4_5.gold @@ -3,7 +3,6 @@ INPUTS CONSTANTS s1 = 1 :: Word8 TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-5_1.gold b/SBVTestSuite/GoldFiles/basic-5_1.gold index bc9d72df9..ab3247e8f 100644 --- a/SBVTestSuite/GoldFiles/basic-5_1.gold +++ b/SBVTestSuite/GoldFiles/basic-5_1.gold @@ -3,7 +3,6 @@ INPUTS s1 :: SWord8, aliasing "q" CONSTANTS TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-5_2.gold b/SBVTestSuite/GoldFiles/basic-5_2.gold index e08b64cbc..0d1175dcb 100644 --- a/SBVTestSuite/GoldFiles/basic-5_2.gold +++ b/SBVTestSuite/GoldFiles/basic-5_2.gold @@ -3,7 +3,6 @@ INPUTS s1 :: SWord8, aliasing "q" CONSTANTS TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-5_3.gold b/SBVTestSuite/GoldFiles/basic-5_3.gold index 4f3ed39fb..639a6ca4c 100644 --- a/SBVTestSuite/GoldFiles/basic-5_3.gold +++ b/SBVTestSuite/GoldFiles/basic-5_3.gold @@ -3,7 +3,6 @@ INPUTS s1 :: SWord8, aliasing "q" CONSTANTS TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-5_4.gold b/SBVTestSuite/GoldFiles/basic-5_4.gold index 4f3ed39fb..639a6ca4c 100644 --- a/SBVTestSuite/GoldFiles/basic-5_4.gold +++ b/SBVTestSuite/GoldFiles/basic-5_4.gold @@ -3,7 +3,6 @@ INPUTS s1 :: SWord8, aliasing "q" CONSTANTS TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/basic-5_5.gold b/SBVTestSuite/GoldFiles/basic-5_5.gold index 4c4eb0627..40bc075b6 100644 --- a/SBVTestSuite/GoldFiles/basic-5_5.gold +++ b/SBVTestSuite/GoldFiles/basic-5_5.gold @@ -4,7 +4,6 @@ INPUTS CONSTANTS s2 = 1 :: Word8 TABLES -ARRAYS UNINTERPRETED CONSTANTS USER GIVEN CODE SEGMENTS AXIOMS-DEFINITIONS diff --git a/SBVTestSuite/GoldFiles/check1.gold b/SBVTestSuite/GoldFiles/check1.gold index 4b6542c2e..481d42a27 100644 --- a/SBVTestSuite/GoldFiles/check1.gold +++ b/SBVTestSuite/GoldFiles/check1.gold @@ -17,15 +17,12 @@ [GOOD] (declare-fun s3 () (_ BitVec 16)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s4 () Bool (= s0 s2)) [GOOD] (define-fun s5 () Bool (= s1 s3)) [GOOD] (define-fun s6 () Bool (and s4 s5)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (not s6)) diff --git a/SBVTestSuite/GoldFiles/check2.gold b/SBVTestSuite/GoldFiles/check2.gold index 0002ea97c..d8b6b5278 100644 --- a/SBVTestSuite/GoldFiles/check2.gold +++ b/SBVTestSuite/GoldFiles/check2.gold @@ -15,14 +15,16 @@ [GOOD] (declare-fun s1 () (_ BitVec 16)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- +[GOOD] (define-fun s2 () Bool (= s0 s0)) +[GOOD] (define-fun s3 () Bool (= s1 s1)) +[GOOD] (define-fun s4 () Bool (and s2 s3)) +[GOOD] (define-fun s5 () Bool (not s4)) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- +[GOOD] (assert (not s5)) [SEND] (check-sat) [RECV] sat [SEND] (get-value (s0)) diff --git a/SBVTestSuite/GoldFiles/concreteFoldl.gold b/SBVTestSuite/GoldFiles/concreteFoldl.gold index 1850ab7da..c409a37c2 100644 --- a/SBVTestSuite/GoldFiles/concreteFoldl.gold +++ b/SBVTestSuite/GoldFiles/concreteFoldl.gold @@ -13,12 +13,9 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [SEND] (check-sat) diff --git a/SBVTestSuite/GoldFiles/concreteFoldr.gold b/SBVTestSuite/GoldFiles/concreteFoldr.gold index 1850ab7da..c409a37c2 100644 --- a/SBVTestSuite/GoldFiles/concreteFoldr.gold +++ b/SBVTestSuite/GoldFiles/concreteFoldr.gold @@ -13,12 +13,9 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [SEND] (check-sat) diff --git a/SBVTestSuite/GoldFiles/concreteReverse.gold b/SBVTestSuite/GoldFiles/concreteReverse.gold index 1850ab7da..c409a37c2 100644 --- a/SBVTestSuite/GoldFiles/concreteReverse.gold +++ b/SBVTestSuite/GoldFiles/concreteReverse.gold @@ -13,12 +13,9 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [SEND] (check-sat) diff --git a/SBVTestSuite/GoldFiles/exceptionLocal1.gold b/SBVTestSuite/GoldFiles/exceptionLocal1.gold index 3ed6f2ba7..8bdaf9fe2 100644 --- a/SBVTestSuite/GoldFiles/exceptionLocal1.gold +++ b/SBVTestSuite/GoldFiles/exceptionLocal1.gold @@ -14,7 +14,6 @@ [GOOD] (declare-fun s0 () (_ BitVec 32)) ; tracks user variable "x" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- diff --git a/SBVTestSuite/GoldFiles/foldlABC1.gold b/SBVTestSuite/GoldFiles/foldlABC1.gold index 784b987ec..143344262 100644 --- a/SBVTestSuite/GoldFiles/foldlABC1.gold +++ b/SBVTestSuite/GoldFiles/foldlABC1.gold @@ -20,7 +20,6 @@ [GOOD] (declare-fun s2 () Int) ; tracks user variable "c" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -39,8 +38,6 @@ [GOOD] (define-fun s16 () Int (+ s0 s1)) [GOOD] (define-fun s17 () Int (+ s2 s16)) [GOOD] (define-fun s18 () Bool (= s15 s17)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s4) diff --git a/SBVTestSuite/GoldFiles/foldlABC2.gold b/SBVTestSuite/GoldFiles/foldlABC2.gold index 59ffcd7c6..878a5daad 100644 --- a/SBVTestSuite/GoldFiles/foldlABC2.gold +++ b/SBVTestSuite/GoldFiles/foldlABC2.gold @@ -21,7 +21,6 @@ [GOOD] (declare-fun s2 () Int) ; tracks user variable "c" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -47,8 +46,6 @@ [GOOD] (define-fun s24 () Int (+ s0 s1)) [GOOD] (define-fun s25 () Int (+ s2 s24)) [GOOD] (define-fun s26 () Bool (= s23 s25)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s4) diff --git a/SBVTestSuite/GoldFiles/foldlABC3.gold b/SBVTestSuite/GoldFiles/foldlABC3.gold index 507744399..6570ca0c4 100644 --- a/SBVTestSuite/GoldFiles/foldlABC3.gold +++ b/SBVTestSuite/GoldFiles/foldlABC3.gold @@ -21,7 +21,6 @@ [GOOD] (declare-fun s2 () Int) ; tracks user variable "c" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -54,8 +53,6 @@ [GOOD] (define-fun s31 () Int (+ s0 s1)) [GOOD] (define-fun s32 () Int (+ s2 s31)) [GOOD] (define-fun s33 () Bool (= s30 s32)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s4) diff --git a/SBVTestSuite/GoldFiles/foldrAB1.gold b/SBVTestSuite/GoldFiles/foldrAB1.gold index 513e683fd..35faed41a 100644 --- a/SBVTestSuite/GoldFiles/foldrAB1.gold +++ b/SBVTestSuite/GoldFiles/foldrAB1.gold @@ -19,7 +19,6 @@ [GOOD] (declare-fun s1 () Int) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -34,8 +33,6 @@ [GOOD] (define-fun s11 () Int (ite s9 s2 s10)) [GOOD] (define-fun s12 () Int (+ s0 s1)) [GOOD] (define-fun s13 () Bool (= s11 s12)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/foldrAB2.gold b/SBVTestSuite/GoldFiles/foldrAB2.gold index df7824296..3053c047e 100644 --- a/SBVTestSuite/GoldFiles/foldrAB2.gold +++ b/SBVTestSuite/GoldFiles/foldrAB2.gold @@ -20,7 +20,6 @@ [GOOD] (declare-fun s1 () Int) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -42,8 +41,6 @@ [GOOD] (define-fun s19 () Int (ite s9 s2 s18)) [GOOD] (define-fun s20 () Int (+ s0 s1)) [GOOD] (define-fun s21 () Bool (= s19 s20)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/foldrAB3.gold b/SBVTestSuite/GoldFiles/foldrAB3.gold index b573f2d6c..75d238912 100644 --- a/SBVTestSuite/GoldFiles/foldrAB3.gold +++ b/SBVTestSuite/GoldFiles/foldrAB3.gold @@ -20,7 +20,6 @@ [GOOD] (declare-fun s1 () Int) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -49,8 +48,6 @@ [GOOD] (define-fun s26 () Int (ite s9 s2 s25)) [GOOD] (define-fun s27 () Int (+ s0 s1)) [GOOD] (define-fun s28 () Bool (= s26 s27)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/genBenchMark1.gold b/SBVTestSuite/GoldFiles/genBenchMark1.gold index 5ba1d59bf..371ab4f67 100644 --- a/SBVTestSuite/GoldFiles/genBenchMark1.gold +++ b/SBVTestSuite/GoldFiles/genBenchMark1.gold @@ -11,14 +11,11 @@ (declare-fun s0 () (_ BitVec 8)) ; --- constant tables --- ; --- non-constant tables --- -; --- arrays --- ; --- uninterpreted constants --- ; --- user defined functions --- ; --- assignments --- (define-fun s2 () (_ BitVec 8) (bvadd s0 s1)) (define-fun s3 () Bool (= s0 s2)) -; --- arrayDelayeds --- -; --- arraySetups --- ; --- delayedEqualities --- ; --- formula --- (assert (not s3)) diff --git a/SBVTestSuite/GoldFiles/genBenchMark2.gold b/SBVTestSuite/GoldFiles/genBenchMark2.gold index 15276a6f6..914ee7d81 100644 --- a/SBVTestSuite/GoldFiles/genBenchMark2.gold +++ b/SBVTestSuite/GoldFiles/genBenchMark2.gold @@ -11,14 +11,11 @@ (declare-fun s0 () (_ BitVec 8)) ; --- constant tables --- ; --- non-constant tables --- -; --- arrays --- ; --- uninterpreted constants --- ; --- user defined functions --- ; --- assignments --- (define-fun s2 () (_ BitVec 8) (bvadd s0 s1)) (define-fun s3 () Bool (= s0 s2)) -; --- arrayDelayeds --- -; --- arraySetups --- ; --- delayedEqualities --- ; --- formula --- (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda02.gold b/SBVTestSuite/GoldFiles/lambda02.gold index 4d06eccc7..e06c33da3 100644 --- a/SBVTestSuite/GoldFiles/lambda02.gold +++ b/SBVTestSuite/GoldFiles/lambda02.gold @@ -1,4 +1,4 @@ (lambda ((l1_s0 Int)) - (let ((l1_s1 1)) - (let ((l1_s2 (+ l1_s0 l1_s1))) - l1_s2))) + (let ((l1_s1 1)) + (let ((l1_s2 (+ l1_s0 l1_s1))) + l1_s2))) diff --git a/SBVTestSuite/GoldFiles/lambda03.gold b/SBVTestSuite/GoldFiles/lambda03.gold index e9088a096..3b7ce691a 100644 --- a/SBVTestSuite/GoldFiles/lambda03.gold +++ b/SBVTestSuite/GoldFiles/lambda03.gold @@ -1,5 +1,5 @@ (lambda ((l1_s0 Int) (l1_s1 Int)) - (let ((l1_s2 2)) - (let ((l1_s3 (* l1_s1 l1_s2))) - (let ((l1_s4 (+ l1_s0 l1_s3))) - l1_s4)))) + (let ((l1_s2 2)) + (let ((l1_s3 (* l1_s1 l1_s2))) + (let ((l1_s4 (+ l1_s0 l1_s3))) + l1_s4)))) diff --git a/SBVTestSuite/GoldFiles/lambda04.gold b/SBVTestSuite/GoldFiles/lambda04.gold index 901a70dbb..a5eb51b07 100644 --- a/SBVTestSuite/GoldFiles/lambda04.gold +++ b/SBVTestSuite/GoldFiles/lambda04.gold @@ -19,16 +19,13 @@ [GOOD] (declare-fun s1 () (Seq Bool)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () (Seq Bool) (seq.map (lambda ((l1_s0 Int)) - false) s0)) + false) s0)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda05.gold b/SBVTestSuite/GoldFiles/lambda05.gold index 93d6b44ed..2e26d3fe9 100644 --- a/SBVTestSuite/GoldFiles/lambda05.gold +++ b/SBVTestSuite/GoldFiles/lambda05.gold @@ -19,22 +19,19 @@ [GOOD] (declare-fun s1 () (Seq Int)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () (Seq Int) (seq.map (lambda ((l1_s0 Int)) - (let ((l1_s1 2)) - (let ((l1_s2 (+ l1_s0 l1_s1))) - l1_s2))) s0)) + (let ((l1_s1 2)) + (let ((l1_s2 (+ l1_s0 l1_s1))) + l1_s2))) s0)) [GOOD] (define-fun s5 () (Seq Int) (seq.map (lambda ((l1_s0 Int)) - (let ((l1_s1 1)) - (let ((l1_s2 (+ l1_s0 l1_s1))) - l1_s2))) s4)) + (let ((l1_s1 1)) + (let ((l1_s2 (+ l1_s0 l1_s1))) + l1_s2))) s4)) [GOOD] (define-fun s6 () Bool (= s1 s5)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda06.gold b/SBVTestSuite/GoldFiles/lambda06.gold index 98b800801..9210f1874 100644 --- a/SBVTestSuite/GoldFiles/lambda06.gold +++ b/SBVTestSuite/GoldFiles/lambda06.gold @@ -19,34 +19,31 @@ [GOOD] (declare-fun s1 () (Seq Int)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () (Seq Int) (seq.map (lambda ((l1_s0 Int)) - (let ((l1_s1 (* l1_s0 l1_s0))) - (let ((l1_s2 (+ l1_s0 l1_s1))) - (let ((l1_s3 (* l1_s0 l1_s1))) - (let ((l1_s4 (+ l1_s2 l1_s3))) - (let ((l1_s5 (* l1_s1 l1_s1))) - (let ((l1_s6 (+ l1_s4 l1_s5))) - (let ((l1_s7 (* l1_s0 l1_s5))) - (let ((l1_s8 (+ l1_s6 l1_s7))) - (let ((l1_s9 (* l1_s1 l1_s5))) - (let ((l1_s10 (+ l1_s8 l1_s9))) - (let ((l1_s11 (* l1_s0 l1_s9))) - (let ((l1_s12 (+ l1_s10 l1_s11))) - (let ((l1_s13 (* l1_s5 l1_s5))) - (let ((l1_s14 (+ l1_s12 l1_s13))) - (let ((l1_s15 (* l1_s0 l1_s13))) - (let ((l1_s16 (+ l1_s14 l1_s15))) - (let ((l1_s17 (* l1_s1 l1_s13))) - (let ((l1_s18 (+ l1_s16 l1_s17))) - l1_s18))))))))))))))))))) s0)) + (let ((l1_s1 (* l1_s0 l1_s0))) + (let ((l1_s2 (+ l1_s0 l1_s1))) + (let ((l1_s3 (* l1_s0 l1_s1))) + (let ((l1_s4 (+ l1_s2 l1_s3))) + (let ((l1_s5 (* l1_s1 l1_s1))) + (let ((l1_s6 (+ l1_s4 l1_s5))) + (let ((l1_s7 (* l1_s0 l1_s5))) + (let ((l1_s8 (+ l1_s6 l1_s7))) + (let ((l1_s9 (* l1_s1 l1_s5))) + (let ((l1_s10 (+ l1_s8 l1_s9))) + (let ((l1_s11 (* l1_s0 l1_s9))) + (let ((l1_s12 (+ l1_s10 l1_s11))) + (let ((l1_s13 (* l1_s5 l1_s5))) + (let ((l1_s14 (+ l1_s12 l1_s13))) + (let ((l1_s15 (* l1_s0 l1_s13))) + (let ((l1_s16 (+ l1_s14 l1_s15))) + (let ((l1_s17 (* l1_s1 l1_s13))) + (let ((l1_s18 (+ l1_s16 l1_s17))) + l1_s18))))))))))))))))))) s0)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda07.gold b/SBVTestSuite/GoldFiles/lambda07.gold index dcea81ba7..7e78a041a 100644 --- a/SBVTestSuite/GoldFiles/lambda07.gold +++ b/SBVTestSuite/GoldFiles/lambda07.gold @@ -20,21 +20,18 @@ [GOOD] (declare-fun s1 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s5 () (Seq Int) (seq.map (lambda ((l1_s0 (Seq Int))) - (let ((l1_s1 0)) - (let ((l1_s2 (seq.foldl (lambda ((l2_s0 Int) (l2_s1 Int)) + (let ((l1_s1 0)) + (let ((l1_s2 (seq.foldl (lambda ((l2_s0 Int) (l2_s1 Int)) (+ l2_s0 l2_s1)) l1_s1 l1_s0))) - l1_s2))) s0)) + l1_s2))) s0)) [GOOD] (define-fun s6 () Int (seq.foldl (lambda ((l1_s0 Int) (l1_s1 Int)) (+ l1_s0 l1_s1)) s4 s5)) [GOOD] (define-fun s7 () Bool (= s1 s6)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda08.gold b/SBVTestSuite/GoldFiles/lambda08.gold index b554fafe5..70cbd26e2 100644 --- a/SBVTestSuite/GoldFiles/lambda08.gold +++ b/SBVTestSuite/GoldFiles/lambda08.gold @@ -19,18 +19,15 @@ [GOOD] (declare-fun s1 () (Seq (_ FloatingPoint 8 24))) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () (Seq (_ FloatingPoint 8 24)) (seq.map (lambda ((l1_s0 (_ FloatingPoint 8 24))) - (let ((l1_s1 ((_ to_fp 8 24) roundNearestTiesToEven (/ 1.0 1.0)))) - (let ((l1_s2 (fp.add roundNearestTiesToEven l1_s0 l1_s1))) - l1_s2))) s0)) + (let ((l1_s1 ((_ to_fp 8 24) roundNearestTiesToEven (/ 1.0 1.0)))) + (let ((l1_s2 (fp.add roundNearestTiesToEven l1_s0 l1_s1))) + l1_s2))) s0)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda09.gold b/SBVTestSuite/GoldFiles/lambda09.gold index 3b47097e7..1c99f7c09 100644 --- a/SBVTestSuite/GoldFiles/lambda09.gold +++ b/SBVTestSuite/GoldFiles/lambda09.gold @@ -19,18 +19,15 @@ [GOOD] (declare-fun s1 () (Seq (_ BitVec 8))) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () (Seq (_ BitVec 8)) (seq.map (lambda ((l1_s0 (_ BitVec 8))) - (let ((l1_s1 #x01)) - (let ((l1_s2 (bvadd l1_s0 l1_s1))) - l1_s2))) s0)) + (let ((l1_s1 #x01)) + (let ((l1_s2 (bvadd l1_s0 l1_s1))) + l1_s2))) s0)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda10.gold b/SBVTestSuite/GoldFiles/lambda10.gold index 26b2ae6ec..a339a2012 100644 --- a/SBVTestSuite/GoldFiles/lambda10.gold +++ b/SBVTestSuite/GoldFiles/lambda10.gold @@ -19,18 +19,15 @@ [GOOD] (declare-fun s1 () (Seq Int)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () (Seq Int) (seq.map (lambda ((l1_s0 Int)) - (let ((l1_s1 1)) - (let ((l1_s2 (+ l1_s0 l1_s1))) - l1_s2))) s0)) + (let ((l1_s1 1)) + (let ((l1_s2 (+ l1_s0 l1_s1))) + l1_s2))) s0)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda11.gold b/SBVTestSuite/GoldFiles/lambda11.gold index 2a9e0ae50..c34f59bf4 100644 --- a/SBVTestSuite/GoldFiles/lambda11.gold +++ b/SBVTestSuite/GoldFiles/lambda11.gold @@ -19,18 +19,15 @@ [GOOD] (declare-fun s1 () (Seq (_ BitVec 8))) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () (Seq (_ BitVec 8)) (seq.map (lambda ((l1_s0 (_ BitVec 8))) - (let ((l1_s1 #x01)) - (let ((l1_s2 (bvadd l1_s0 l1_s1))) - l1_s2))) s0)) + (let ((l1_s1 #x01)) + (let ((l1_s2 (bvadd l1_s0 l1_s1))) + l1_s2))) s0)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda12.gold b/SBVTestSuite/GoldFiles/lambda12.gold index 5398a26cc..89bf2d151 100644 --- a/SBVTestSuite/GoldFiles/lambda12.gold +++ b/SBVTestSuite/GoldFiles/lambda12.gold @@ -19,7 +19,6 @@ [GOOD] (declare-fun s1 () (Seq (Seq Int))) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -27,8 +26,6 @@ [GOOD] (define-fun s4 () (Seq (Seq Int)) (seq.map (lambda ((l1_s0 Int)) (seq.unit l1_s0)) s0)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda13.gold b/SBVTestSuite/GoldFiles/lambda13.gold index 253dacb73..7520e6104 100644 --- a/SBVTestSuite/GoldFiles/lambda13.gold +++ b/SBVTestSuite/GoldFiles/lambda13.gold @@ -22,19 +22,16 @@ [GOOD] (declare-fun s1 () (Seq Int)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () (Seq Int) (seq.map (lambda ((l1_s0 (SBVTuple2 Int Int))) - (let ((l1_s1 (proj_1_SBVTuple2 l1_s0))) - (let ((l1_s2 (proj_2_SBVTuple2 l1_s0))) - (let ((l1_s3 (+ l1_s1 l1_s2))) - l1_s3)))) s0)) + (let ((l1_s1 (proj_1_SBVTuple2 l1_s0))) + (let ((l1_s2 (proj_2_SBVTuple2 l1_s0))) + (let ((l1_s3 (+ l1_s1 l1_s2))) + l1_s3)))) s0)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda14.gold b/SBVTestSuite/GoldFiles/lambda14.gold index d85c810ee..f61a42019 100644 --- a/SBVTestSuite/GoldFiles/lambda14.gold +++ b/SBVTestSuite/GoldFiles/lambda14.gold @@ -20,7 +20,6 @@ [GOOD] (declare-fun s1 () (Seq Int)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -28,8 +27,6 @@ [GOOD] (define-fun s5 () (Seq Int) (seq.mapi (lambda ((l1_s0 Int) (l1_s1 Int)) (+ l1_s0 l1_s1)) s4 s0)) [GOOD] (define-fun s6 () Bool (= s1 s5)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda15.gold b/SBVTestSuite/GoldFiles/lambda15.gold index 8ebdee479..637769b2d 100644 --- a/SBVTestSuite/GoldFiles/lambda15.gold +++ b/SBVTestSuite/GoldFiles/lambda15.gold @@ -20,7 +20,6 @@ [GOOD] (declare-fun s1 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -28,8 +27,6 @@ [GOOD] (define-fun s5 () Int (seq.foldl (lambda ((l1_s0 Int) (l1_s1 Int)) (+ l1_s0 l1_s1)) s4 s0)) [GOOD] (define-fun s6 () Bool (= s1 s5)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda16.gold b/SBVTestSuite/GoldFiles/lambda16.gold index a43055e2f..5aac0ef59 100644 --- a/SBVTestSuite/GoldFiles/lambda16.gold +++ b/SBVTestSuite/GoldFiles/lambda16.gold @@ -20,7 +20,6 @@ [GOOD] (declare-fun s1 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -28,8 +27,6 @@ [GOOD] (define-fun s5 () Int (seq.foldl (lambda ((l1_s0 Int) (l1_s1 Int)) (* l1_s0 l1_s1)) s4 s0)) [GOOD] (define-fun s6 () Bool (= s1 s5)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda17.gold b/SBVTestSuite/GoldFiles/lambda17.gold index a63d71572..5556cec70 100644 --- a/SBVTestSuite/GoldFiles/lambda17.gold +++ b/SBVTestSuite/GoldFiles/lambda17.gold @@ -20,18 +20,15 @@ [GOOD] (declare-fun s1 () (Seq Int)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s5 () (Seq Int) (seq.foldl (lambda ((l1_s0 (Seq Int)) (l1_s1 Int)) - (let ((l1_s2 (seq.unit l1_s1))) - (let ((l1_s3 (seq.++ l1_s2 l1_s0))) - l1_s3))) s4 s0)) + (let ((l1_s2 (seq.unit l1_s1))) + (let ((l1_s3 (seq.++ l1_s2 l1_s0))) + l1_s3))) s4 s0)) [GOOD] (define-fun s6 () Bool (= s1 s5)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda18.gold b/SBVTestSuite/GoldFiles/lambda18.gold index d82c06b30..e3f25d156 100644 --- a/SBVTestSuite/GoldFiles/lambda18.gold +++ b/SBVTestSuite/GoldFiles/lambda18.gold @@ -21,18 +21,15 @@ [GOOD] (declare-fun s1 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s6 () Int (seq.foldli (lambda ((l1_s0 Int) (l1_s1 Int) (l1_s2 Int)) - (let ((l1_s3 (+ l1_s0 l1_s1))) - (let ((l1_s4 (+ l1_s2 l1_s3))) - l1_s4))) s4 s5 s0)) + (let ((l1_s3 (+ l1_s0 l1_s1))) + (let ((l1_s4 (+ l1_s2 l1_s3))) + l1_s4))) s4 s5 s0)) [GOOD] (define-fun s7 () Bool (= s1 s6)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda19.gold b/SBVTestSuite/GoldFiles/lambda19.gold index 584081a36..8bae6b50f 100644 --- a/SBVTestSuite/GoldFiles/lambda19.gold +++ b/SBVTestSuite/GoldFiles/lambda19.gold @@ -20,22 +20,19 @@ [GOOD] (declare-fun s1 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- SBV Function definitions -[GOOD] (define-fun-rec sbv.reverse_0 ((lst (Seq Int))) (Seq Int) +[GOOD] (define-fun-rec |sbv.reverse_[SInteger]| ((lst (Seq Int))) (Seq Int) (ite (= lst (as seq.empty (Seq Int))) (as seq.empty (Seq Int)) - (seq.++ (sbv.reverse_0 (seq.extract lst 1 (- (seq.len lst) 1))) (seq.unit (seq.nth lst 0))))) + (seq.++ (|sbv.reverse_[SInteger]| (seq.extract lst 1 (- (seq.len lst) 1))) (seq.unit (seq.nth lst 0))))) [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) -[GOOD] (define-fun s5 () (Seq Int) (sbv.reverse_0 s0)) +[GOOD] (define-fun s5 () (Seq Int) (|sbv.reverse_[SInteger]| s0)) [GOOD] (define-fun s6 () Int (seq.foldl (lambda ((l1_s0 Int) (l1_s1 Int)) (+ l1_s0 l1_s1)) s4 s5)) [GOOD] (define-fun s7 () Bool (= s1 s6)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda20.gold b/SBVTestSuite/GoldFiles/lambda20.gold index 7f9ccb8df..8b5773eb0 100644 --- a/SBVTestSuite/GoldFiles/lambda20.gold +++ b/SBVTestSuite/GoldFiles/lambda20.gold @@ -20,22 +20,19 @@ [GOOD] (declare-fun s1 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- SBV Function definitions -[GOOD] (define-fun-rec sbv.reverse_0 ((lst (Seq Int))) (Seq Int) +[GOOD] (define-fun-rec |sbv.reverse_[SInteger]| ((lst (Seq Int))) (Seq Int) (ite (= lst (as seq.empty (Seq Int))) (as seq.empty (Seq Int)) - (seq.++ (sbv.reverse_0 (seq.extract lst 1 (- (seq.len lst) 1))) (seq.unit (seq.nth lst 0))))) + (seq.++ (|sbv.reverse_[SInteger]| (seq.extract lst 1 (- (seq.len lst) 1))) (seq.unit (seq.nth lst 0))))) [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) -[GOOD] (define-fun s5 () (Seq Int) (sbv.reverse_0 s0)) +[GOOD] (define-fun s5 () (Seq Int) (|sbv.reverse_[SInteger]| s0)) [GOOD] (define-fun s6 () Int (seq.foldl (lambda ((l1_s0 Int) (l1_s1 Int)) (* l1_s0 l1_s1)) s4 s5)) [GOOD] (define-fun s7 () Bool (= s1 s6)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda21.gold b/SBVTestSuite/GoldFiles/lambda21.gold index 86388897b..bbe55f04e 100644 --- a/SBVTestSuite/GoldFiles/lambda21.gold +++ b/SBVTestSuite/GoldFiles/lambda21.gold @@ -20,24 +20,21 @@ [GOOD] (declare-fun s1 () (Seq Int)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- SBV Function definitions -[GOOD] (define-fun-rec sbv.reverse_0 ((lst (Seq Int))) (Seq Int) +[GOOD] (define-fun-rec |sbv.reverse_[SInteger]| ((lst (Seq Int))) (Seq Int) (ite (= lst (as seq.empty (Seq Int))) (as seq.empty (Seq Int)) - (seq.++ (sbv.reverse_0 (seq.extract lst 1 (- (seq.len lst) 1))) (seq.unit (seq.nth lst 0))))) + (seq.++ (|sbv.reverse_[SInteger]| (seq.extract lst 1 (- (seq.len lst) 1))) (seq.unit (seq.nth lst 0))))) [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) -[GOOD] (define-fun s5 () (Seq Int) (sbv.reverse_0 s0)) +[GOOD] (define-fun s5 () (Seq Int) (|sbv.reverse_[SInteger]| s0)) [GOOD] (define-fun s6 () (Seq Int) (seq.foldl (lambda ((l1_s0 (Seq Int)) (l1_s1 Int)) - (let ((l1_s2 (seq.unit l1_s1))) - (let ((l1_s3 (seq.++ l1_s0 l1_s2))) - l1_s3))) s4 s5)) + (let ((l1_s2 (seq.unit l1_s1))) + (let ((l1_s3 (seq.++ l1_s0 l1_s2))) + l1_s3))) s4 s5)) [GOOD] (define-fun s7 () Bool (= s1 s6)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda22.gold b/SBVTestSuite/GoldFiles/lambda22.gold index ca3ff73cd..bc7b08084 100644 --- a/SBVTestSuite/GoldFiles/lambda22.gold +++ b/SBVTestSuite/GoldFiles/lambda22.gold @@ -26,7 +26,6 @@ [GOOD] (declare-fun s2 () (Seq (SBVTuple2 Int Int))) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -42,14 +41,12 @@ [GOOD] (define-fun s16 () (Seq (SBVTuple2 Int Int)) (seq.mapi (lambda ((l1_s0 Int) (l1_s1 Int)) ((as mkSBVTuple2 (SBVTuple2 Int Int)) l1_s0 l1_s1)) s7 s15)) [GOOD] (define-fun s17 () (Seq (SBVTuple2 Int Int)) (seq.map (lambda ((l1_s0 (SBVTuple2 Int Int))) - (let ((l1_s1 (proj_2_SBVTuple2 l1_s0))) - (let ((l1_s2 (proj_1_SBVTuple2 l1_s0))) - (let ((l1_s3 (seq.nth s1 l1_s2))) - (let ((l1_s4 ((as mkSBVTuple2 (SBVTuple2 Int Int)) l1_s1 l1_s3))) - l1_s4))))) s16)) + (let ((l1_s1 (proj_2_SBVTuple2 l1_s0))) + (let ((l1_s2 (proj_1_SBVTuple2 l1_s0))) + (let ((l1_s3 (seq.nth s1 l1_s2))) + (let ((l1_s4 ((as mkSBVTuple2 (SBVTuple2 Int Int)) l1_s1 l1_s3))) + l1_s4))))) s16)) [GOOD] (define-fun s18 () Bool (= s2 s17)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s4) diff --git a/SBVTestSuite/GoldFiles/lambda23.gold b/SBVTestSuite/GoldFiles/lambda23.gold index ee3adacdd..7708b4bfa 100644 --- a/SBVTestSuite/GoldFiles/lambda23.gold +++ b/SBVTestSuite/GoldFiles/lambda23.gold @@ -26,13 +26,12 @@ [GOOD] (declare-fun s2 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- SBV Function definitions -[GOOD] (define-fun-rec sbv.reverse_0 ((lst (Seq Int))) (Seq Int) +[GOOD] (define-fun-rec |sbv.reverse_[SInteger]| ((lst (Seq Int))) (Seq Int) (ite (= lst (as seq.empty (Seq Int))) (as seq.empty (Seq Int)) - (seq.++ (sbv.reverse_0 (seq.extract lst 1 (- (seq.len lst) 1))) (seq.unit (seq.nth lst 0))))) + (seq.++ (|sbv.reverse_[SInteger]| (seq.extract lst 1 (- (seq.len lst) 1))) (seq.unit (seq.nth lst 0))))) [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s4 () Bool (= s0 s3)) @@ -47,22 +46,20 @@ [GOOD] (define-fun s16 () (Seq (SBVTuple2 Int Int)) (seq.mapi (lambda ((l1_s0 Int) (l1_s1 Int)) ((as mkSBVTuple2 (SBVTuple2 Int Int)) l1_s0 l1_s1)) s7 s15)) [GOOD] (define-fun s17 () (Seq (SBVTuple2 Int Int)) (seq.map (lambda ((l1_s0 (SBVTuple2 Int Int))) - (let ((l1_s1 (proj_2_SBVTuple2 l1_s0))) - (let ((l1_s2 (proj_1_SBVTuple2 l1_s0))) - (let ((l1_s3 (seq.nth s1 l1_s2))) - (let ((l1_s4 ((as mkSBVTuple2 (SBVTuple2 Int Int)) l1_s1 l1_s3))) - l1_s4))))) s16)) + (let ((l1_s1 (proj_2_SBVTuple2 l1_s0))) + (let ((l1_s2 (proj_1_SBVTuple2 l1_s0))) + (let ((l1_s3 (seq.nth s1 l1_s2))) + (let ((l1_s4 ((as mkSBVTuple2 (SBVTuple2 Int Int)) l1_s1 l1_s3))) + l1_s4))))) s16)) [GOOD] (define-fun s18 () (Seq Int) (seq.map (lambda ((l1_s0 (SBVTuple2 Int Int))) - (let ((l1_s1 (proj_1_SBVTuple2 l1_s0))) - (let ((l1_s2 (proj_2_SBVTuple2 l1_s0))) - (let ((l1_s3 (+ l1_s1 l1_s2))) - l1_s3)))) s17)) -[GOOD] (define-fun s19 () (Seq Int) (sbv.reverse_0 s18)) + (let ((l1_s1 (proj_1_SBVTuple2 l1_s0))) + (let ((l1_s2 (proj_2_SBVTuple2 l1_s0))) + (let ((l1_s3 (+ l1_s1 l1_s2))) + l1_s3)))) s17)) +[GOOD] (define-fun s19 () (Seq Int) (|sbv.reverse_[SInteger]| s18)) [GOOD] (define-fun s20 () Int (seq.foldl (lambda ((l1_s0 Int) (l1_s1 Int)) (+ l1_s0 l1_s1)) s7 s19)) [GOOD] (define-fun s21 () Bool (= s2 s20)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s4) diff --git a/SBVTestSuite/GoldFiles/lambda24.gold b/SBVTestSuite/GoldFiles/lambda24.gold index 91aa4111b..b61faf63f 100644 --- a/SBVTestSuite/GoldFiles/lambda24.gold +++ b/SBVTestSuite/GoldFiles/lambda24.gold @@ -26,7 +26,6 @@ [GOOD] (declare-fun s2 () (Seq Int)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -42,14 +41,12 @@ [GOOD] (define-fun s16 () (Seq (SBVTuple2 Int Int)) (seq.mapi (lambda ((l1_s0 Int) (l1_s1 Int)) ((as mkSBVTuple2 (SBVTuple2 Int Int)) l1_s0 l1_s1)) s7 s15)) [GOOD] (define-fun s17 () (Seq Int) (seq.map (lambda ((l1_s0 (SBVTuple2 Int Int))) - (let ((l1_s1 (proj_2_SBVTuple2 l1_s0))) - (let ((l1_s2 (proj_1_SBVTuple2 l1_s0))) - (let ((l1_s3 (seq.nth s1 l1_s2))) - (let ((l1_s4 (+ l1_s1 l1_s3))) - l1_s4))))) s16)) + (let ((l1_s1 (proj_2_SBVTuple2 l1_s0))) + (let ((l1_s2 (proj_1_SBVTuple2 l1_s0))) + (let ((l1_s3 (seq.nth s1 l1_s2))) + (let ((l1_s4 (+ l1_s1 l1_s3))) + l1_s4))))) s16)) [GOOD] (define-fun s18 () Bool (= s2 s17)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s4) diff --git a/SBVTestSuite/GoldFiles/lambda25.gold b/SBVTestSuite/GoldFiles/lambda25.gold index a6a00223b..f7f580109 100644 --- a/SBVTestSuite/GoldFiles/lambda25.gold +++ b/SBVTestSuite/GoldFiles/lambda25.gold @@ -26,13 +26,12 @@ [GOOD] (declare-fun s2 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- SBV Function definitions -[GOOD] (define-fun-rec sbv.reverse_0 ((lst (Seq Int))) (Seq Int) +[GOOD] (define-fun-rec |sbv.reverse_[SInteger]| ((lst (Seq Int))) (Seq Int) (ite (= lst (as seq.empty (Seq Int))) (as seq.empty (Seq Int)) - (seq.++ (sbv.reverse_0 (seq.extract lst 1 (- (seq.len lst) 1))) (seq.unit (seq.nth lst 0))))) + (seq.++ (|sbv.reverse_[SInteger]| (seq.extract lst 1 (- (seq.len lst) 1))) (seq.unit (seq.nth lst 0))))) [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s4 () Bool (= s0 s3)) @@ -47,17 +46,15 @@ [GOOD] (define-fun s16 () (Seq (SBVTuple2 Int Int)) (seq.mapi (lambda ((l1_s0 Int) (l1_s1 Int)) ((as mkSBVTuple2 (SBVTuple2 Int Int)) l1_s0 l1_s1)) s7 s15)) [GOOD] (define-fun s17 () (Seq Int) (seq.map (lambda ((l1_s0 (SBVTuple2 Int Int))) - (let ((l1_s1 (proj_2_SBVTuple2 l1_s0))) - (let ((l1_s2 (proj_1_SBVTuple2 l1_s0))) - (let ((l1_s3 (seq.nth s1 l1_s2))) - (let ((l1_s4 (+ l1_s1 l1_s3))) - l1_s4))))) s16)) -[GOOD] (define-fun s18 () (Seq Int) (sbv.reverse_0 s17)) + (let ((l1_s1 (proj_2_SBVTuple2 l1_s0))) + (let ((l1_s2 (proj_1_SBVTuple2 l1_s0))) + (let ((l1_s3 (seq.nth s1 l1_s2))) + (let ((l1_s4 (+ l1_s1 l1_s3))) + l1_s4))))) s16)) +[GOOD] (define-fun s18 () (Seq Int) (|sbv.reverse_[SInteger]| s17)) [GOOD] (define-fun s19 () Int (seq.foldl (lambda ((l1_s0 Int) (l1_s1 Int)) (+ l1_s0 l1_s1)) s7 s18)) [GOOD] (define-fun s20 () Bool (= s2 s19)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s4) diff --git a/SBVTestSuite/GoldFiles/lambda26.gold b/SBVTestSuite/GoldFiles/lambda26.gold index 730423881..0d9e640e5 100644 --- a/SBVTestSuite/GoldFiles/lambda26.gold +++ b/SBVTestSuite/GoldFiles/lambda26.gold @@ -20,7 +20,6 @@ [GOOD] (declare-fun s1 () (Seq Int)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -28,8 +27,6 @@ [GOOD] (define-fun s5 () (Seq Int) (seq.foldl (lambda ((l1_s0 (Seq Int)) (l1_s1 (Seq Int))) (seq.++ l1_s0 l1_s1)) s4 s0)) [GOOD] (define-fun s6 () Bool (= s1 s5)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda27.gold b/SBVTestSuite/GoldFiles/lambda27.gold index 0096046f4..c79a5edf4 100644 --- a/SBVTestSuite/GoldFiles/lambda27.gold +++ b/SBVTestSuite/GoldFiles/lambda27.gold @@ -19,36 +19,33 @@ [GOOD] (declare-fun s1 () Bool) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () Bool (seq.foldl (lambda ((l1_s0 Bool) (l1_s1 Int)) - (let ((l1_s2 2)) - (let ((l1_s4 0)) - (let ((l1_s8 1)) - (let ((l1_s14 (- 1))) - (let ((l1_s3 (mod l1_s1 l1_s2))) - (let ((l1_s5 (>= l1_s1 l1_s4))) - (let ((l1_s6 (= l1_s3 l1_s4))) - (let ((l1_s7 (or l1_s5 l1_s6))) - (let ((l1_s9 (ite l1_s7 l1_s4 l1_s8))) - (let ((l1_s10 (* l1_s2 l1_s9))) - (let ((l1_s11 (- l1_s3 l1_s10))) - (let ((l1_s12 (> l1_s11 l1_s4))) - (let ((l1_s13 (< l1_s11 l1_s4))) - (let ((l1_s15 (ite l1_s13 l1_s14 l1_s11))) - (let ((l1_s16 (ite l1_s12 l1_s8 l1_s15))) - (let ((l1_s17 (= l1_s14 l1_s16))) - (let ((l1_s18 (+ l1_s2 l1_s11))) - (let ((l1_s19 (ite l1_s17 l1_s18 l1_s11))) - (let ((l1_s20 (= l1_s4 l1_s19))) - (let ((l1_s21 (and l1_s0 l1_s20))) - l1_s21))))))))))))))))))))) true s0)) + (let ((l1_s2 2)) + (let ((l1_s4 0)) + (let ((l1_s8 1)) + (let ((l1_s14 (- 1))) + (let ((l1_s3 (mod l1_s1 l1_s2))) + (let ((l1_s5 (>= l1_s1 l1_s4))) + (let ((l1_s6 (= l1_s3 l1_s4))) + (let ((l1_s7 (or l1_s5 l1_s6))) + (let ((l1_s9 (ite l1_s7 l1_s4 l1_s8))) + (let ((l1_s10 (* l1_s2 l1_s9))) + (let ((l1_s11 (- l1_s3 l1_s10))) + (let ((l1_s12 (> l1_s11 l1_s4))) + (let ((l1_s13 (< l1_s11 l1_s4))) + (let ((l1_s15 (ite l1_s13 l1_s14 l1_s11))) + (let ((l1_s16 (ite l1_s12 l1_s8 l1_s15))) + (let ((l1_s17 (= l1_s14 l1_s16))) + (let ((l1_s18 (+ l1_s2 l1_s11))) + (let ((l1_s19 (ite l1_s17 l1_s18 l1_s11))) + (let ((l1_s20 (= l1_s4 l1_s19))) + (let ((l1_s21 (and l1_s0 l1_s20))) + l1_s21))))))))))))))))))))) true s0)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda28.gold b/SBVTestSuite/GoldFiles/lambda28.gold index 11883f84e..76bdfe595 100644 --- a/SBVTestSuite/GoldFiles/lambda28.gold +++ b/SBVTestSuite/GoldFiles/lambda28.gold @@ -19,36 +19,33 @@ [GOOD] (declare-fun s1 () Bool) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () Bool (seq.foldl (lambda ((l1_s0 Bool) (l1_s1 Int)) - (let ((l1_s2 2)) - (let ((l1_s4 0)) - (let ((l1_s8 1)) - (let ((l1_s14 (- 1))) - (let ((l1_s3 (mod l1_s1 l1_s2))) - (let ((l1_s5 (>= l1_s1 l1_s4))) - (let ((l1_s6 (= l1_s3 l1_s4))) - (let ((l1_s7 (or l1_s5 l1_s6))) - (let ((l1_s9 (ite l1_s7 l1_s4 l1_s8))) - (let ((l1_s10 (* l1_s2 l1_s9))) - (let ((l1_s11 (- l1_s3 l1_s10))) - (let ((l1_s12 (> l1_s11 l1_s4))) - (let ((l1_s13 (< l1_s11 l1_s4))) - (let ((l1_s15 (ite l1_s13 l1_s14 l1_s11))) - (let ((l1_s16 (ite l1_s12 l1_s8 l1_s15))) - (let ((l1_s17 (= l1_s14 l1_s16))) - (let ((l1_s18 (+ l1_s2 l1_s11))) - (let ((l1_s19 (ite l1_s17 l1_s18 l1_s11))) - (let ((l1_s20 (= l1_s4 l1_s19))) - (let ((l1_s21 (and l1_s0 l1_s20))) - l1_s21))))))))))))))))))))) true s0)) + (let ((l1_s2 2)) + (let ((l1_s4 0)) + (let ((l1_s8 1)) + (let ((l1_s14 (- 1))) + (let ((l1_s3 (mod l1_s1 l1_s2))) + (let ((l1_s5 (>= l1_s1 l1_s4))) + (let ((l1_s6 (= l1_s3 l1_s4))) + (let ((l1_s7 (or l1_s5 l1_s6))) + (let ((l1_s9 (ite l1_s7 l1_s4 l1_s8))) + (let ((l1_s10 (* l1_s2 l1_s9))) + (let ((l1_s11 (- l1_s3 l1_s10))) + (let ((l1_s12 (> l1_s11 l1_s4))) + (let ((l1_s13 (< l1_s11 l1_s4))) + (let ((l1_s15 (ite l1_s13 l1_s14 l1_s11))) + (let ((l1_s16 (ite l1_s12 l1_s8 l1_s15))) + (let ((l1_s17 (= l1_s14 l1_s16))) + (let ((l1_s18 (+ l1_s2 l1_s11))) + (let ((l1_s19 (ite l1_s17 l1_s18 l1_s11))) + (let ((l1_s20 (= l1_s4 l1_s19))) + (let ((l1_s21 (and l1_s0 l1_s20))) + l1_s21))))))))))))))))))))) true s0)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda29.gold b/SBVTestSuite/GoldFiles/lambda29.gold index 5c0035501..f09cf40d7 100644 --- a/SBVTestSuite/GoldFiles/lambda29.gold +++ b/SBVTestSuite/GoldFiles/lambda29.gold @@ -19,36 +19,33 @@ [GOOD] (declare-fun s1 () Bool) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () Bool (seq.foldl (lambda ((l1_s0 Bool) (l1_s1 Int)) - (let ((l1_s2 2)) - (let ((l1_s4 0)) - (let ((l1_s8 1)) - (let ((l1_s14 (- 1))) - (let ((l1_s3 (mod l1_s1 l1_s2))) - (let ((l1_s5 (>= l1_s1 l1_s4))) - (let ((l1_s6 (= l1_s3 l1_s4))) - (let ((l1_s7 (or l1_s5 l1_s6))) - (let ((l1_s9 (ite l1_s7 l1_s4 l1_s8))) - (let ((l1_s10 (* l1_s2 l1_s9))) - (let ((l1_s11 (- l1_s3 l1_s10))) - (let ((l1_s12 (> l1_s11 l1_s4))) - (let ((l1_s13 (< l1_s11 l1_s4))) - (let ((l1_s15 (ite l1_s13 l1_s14 l1_s11))) - (let ((l1_s16 (ite l1_s12 l1_s8 l1_s15))) - (let ((l1_s17 (= l1_s14 l1_s16))) - (let ((l1_s18 (+ l1_s2 l1_s11))) - (let ((l1_s19 (ite l1_s17 l1_s18 l1_s11))) - (let ((l1_s20 (distinct l1_s4 l1_s19))) - (let ((l1_s21 (or l1_s0 l1_s20))) - l1_s21))))))))))))))))))))) false s0)) + (let ((l1_s2 2)) + (let ((l1_s4 0)) + (let ((l1_s8 1)) + (let ((l1_s14 (- 1))) + (let ((l1_s3 (mod l1_s1 l1_s2))) + (let ((l1_s5 (>= l1_s1 l1_s4))) + (let ((l1_s6 (= l1_s3 l1_s4))) + (let ((l1_s7 (or l1_s5 l1_s6))) + (let ((l1_s9 (ite l1_s7 l1_s4 l1_s8))) + (let ((l1_s10 (* l1_s2 l1_s9))) + (let ((l1_s11 (- l1_s3 l1_s10))) + (let ((l1_s12 (> l1_s11 l1_s4))) + (let ((l1_s13 (< l1_s11 l1_s4))) + (let ((l1_s15 (ite l1_s13 l1_s14 l1_s11))) + (let ((l1_s16 (ite l1_s12 l1_s8 l1_s15))) + (let ((l1_s17 (= l1_s14 l1_s16))) + (let ((l1_s18 (+ l1_s2 l1_s11))) + (let ((l1_s19 (ite l1_s17 l1_s18 l1_s11))) + (let ((l1_s20 (distinct l1_s4 l1_s19))) + (let ((l1_s21 (or l1_s0 l1_s20))) + l1_s21))))))))))))))))))))) false s0)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda30.gold b/SBVTestSuite/GoldFiles/lambda30.gold index 3f22d6505..b7a79e15c 100644 --- a/SBVTestSuite/GoldFiles/lambda30.gold +++ b/SBVTestSuite/GoldFiles/lambda30.gold @@ -19,36 +19,33 @@ [GOOD] (declare-fun s1 () Bool) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () Bool (seq.foldl (lambda ((l1_s0 Bool) (l1_s1 Int)) - (let ((l1_s2 2)) - (let ((l1_s4 0)) - (let ((l1_s8 1)) - (let ((l1_s14 (- 1))) - (let ((l1_s3 (mod l1_s1 l1_s2))) - (let ((l1_s5 (>= l1_s1 l1_s4))) - (let ((l1_s6 (= l1_s3 l1_s4))) - (let ((l1_s7 (or l1_s5 l1_s6))) - (let ((l1_s9 (ite l1_s7 l1_s4 l1_s8))) - (let ((l1_s10 (* l1_s2 l1_s9))) - (let ((l1_s11 (- l1_s3 l1_s10))) - (let ((l1_s12 (> l1_s11 l1_s4))) - (let ((l1_s13 (< l1_s11 l1_s4))) - (let ((l1_s15 (ite l1_s13 l1_s14 l1_s11))) - (let ((l1_s16 (ite l1_s12 l1_s8 l1_s15))) - (let ((l1_s17 (= l1_s14 l1_s16))) - (let ((l1_s18 (+ l1_s2 l1_s11))) - (let ((l1_s19 (ite l1_s17 l1_s18 l1_s11))) - (let ((l1_s20 (= l1_s4 l1_s19))) - (let ((l1_s21 (or l1_s0 l1_s20))) - l1_s21))))))))))))))))))))) false s0)) + (let ((l1_s2 2)) + (let ((l1_s4 0)) + (let ((l1_s8 1)) + (let ((l1_s14 (- 1))) + (let ((l1_s3 (mod l1_s1 l1_s2))) + (let ((l1_s5 (>= l1_s1 l1_s4))) + (let ((l1_s6 (= l1_s3 l1_s4))) + (let ((l1_s7 (or l1_s5 l1_s6))) + (let ((l1_s9 (ite l1_s7 l1_s4 l1_s8))) + (let ((l1_s10 (* l1_s2 l1_s9))) + (let ((l1_s11 (- l1_s3 l1_s10))) + (let ((l1_s12 (> l1_s11 l1_s4))) + (let ((l1_s13 (< l1_s11 l1_s4))) + (let ((l1_s15 (ite l1_s13 l1_s14 l1_s11))) + (let ((l1_s16 (ite l1_s12 l1_s8 l1_s15))) + (let ((l1_s17 (= l1_s14 l1_s16))) + (let ((l1_s18 (+ l1_s2 l1_s11))) + (let ((l1_s19 (ite l1_s17 l1_s18 l1_s11))) + (let ((l1_s20 (= l1_s4 l1_s19))) + (let ((l1_s21 (or l1_s0 l1_s20))) + l1_s21))))))))))))))))))))) false s0)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda31.gold b/SBVTestSuite/GoldFiles/lambda31.gold index 8d07308cd..00e613fd7 100644 --- a/SBVTestSuite/GoldFiles/lambda31.gold +++ b/SBVTestSuite/GoldFiles/lambda31.gold @@ -20,39 +20,36 @@ [GOOD] (declare-fun s1 () (Seq Int)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s5 () (Seq Int) (seq.foldl (lambda ((l1_s0 (Seq Int)) (l1_s1 Int)) - (let ((l1_s2 2)) - (let ((l1_s4 0)) - (let ((l1_s8 1)) - (let ((l1_s14 (- 1))) - (let ((l1_s22 (as seq.empty (Seq Int)))) - (let ((l1_s3 (mod l1_s1 l1_s2))) - (let ((l1_s5 (>= l1_s1 l1_s4))) - (let ((l1_s6 (= l1_s3 l1_s4))) - (let ((l1_s7 (or l1_s5 l1_s6))) - (let ((l1_s9 (ite l1_s7 l1_s4 l1_s8))) - (let ((l1_s10 (* l1_s2 l1_s9))) - (let ((l1_s11 (- l1_s3 l1_s10))) - (let ((l1_s12 (> l1_s11 l1_s4))) - (let ((l1_s13 (< l1_s11 l1_s4))) - (let ((l1_s15 (ite l1_s13 l1_s14 l1_s11))) - (let ((l1_s16 (ite l1_s12 l1_s8 l1_s15))) - (let ((l1_s17 (= l1_s14 l1_s16))) - (let ((l1_s18 (+ l1_s2 l1_s11))) - (let ((l1_s19 (ite l1_s17 l1_s18 l1_s11))) - (let ((l1_s20 (= l1_s4 l1_s19))) - (let ((l1_s21 (seq.unit l1_s1))) - (let ((l1_s23 (ite l1_s20 l1_s21 l1_s22))) - (let ((l1_s24 (seq.++ l1_s0 l1_s23))) - l1_s24)))))))))))))))))))))))) s4 s0)) + (let ((l1_s2 2)) + (let ((l1_s4 0)) + (let ((l1_s8 1)) + (let ((l1_s14 (- 1))) + (let ((l1_s22 (as seq.empty (Seq Int)))) + (let ((l1_s3 (mod l1_s1 l1_s2))) + (let ((l1_s5 (>= l1_s1 l1_s4))) + (let ((l1_s6 (= l1_s3 l1_s4))) + (let ((l1_s7 (or l1_s5 l1_s6))) + (let ((l1_s9 (ite l1_s7 l1_s4 l1_s8))) + (let ((l1_s10 (* l1_s2 l1_s9))) + (let ((l1_s11 (- l1_s3 l1_s10))) + (let ((l1_s12 (> l1_s11 l1_s4))) + (let ((l1_s13 (< l1_s11 l1_s4))) + (let ((l1_s15 (ite l1_s13 l1_s14 l1_s11))) + (let ((l1_s16 (ite l1_s12 l1_s8 l1_s15))) + (let ((l1_s17 (= l1_s14 l1_s16))) + (let ((l1_s18 (+ l1_s2 l1_s11))) + (let ((l1_s19 (ite l1_s17 l1_s18 l1_s11))) + (let ((l1_s20 (= l1_s4 l1_s19))) + (let ((l1_s21 (seq.unit l1_s1))) + (let ((l1_s23 (ite l1_s20 l1_s21 l1_s22))) + (let ((l1_s24 (seq.++ l1_s0 l1_s23))) + l1_s24)))))))))))))))))))))))) s4 s0)) [GOOD] (define-fun s6 () Bool (= s1 s5)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda32.gold b/SBVTestSuite/GoldFiles/lambda32.gold index f2e40928f..6b8e564d6 100644 --- a/SBVTestSuite/GoldFiles/lambda32.gold +++ b/SBVTestSuite/GoldFiles/lambda32.gold @@ -20,39 +20,36 @@ [GOOD] (declare-fun s1 () (Seq Int)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s5 () (Seq Int) (seq.foldl (lambda ((l1_s0 (Seq Int)) (l1_s1 Int)) - (let ((l1_s2 2)) - (let ((l1_s4 0)) - (let ((l1_s8 1)) - (let ((l1_s14 (- 1))) - (let ((l1_s22 (as seq.empty (Seq Int)))) - (let ((l1_s3 (mod l1_s1 l1_s2))) - (let ((l1_s5 (>= l1_s1 l1_s4))) - (let ((l1_s6 (= l1_s3 l1_s4))) - (let ((l1_s7 (or l1_s5 l1_s6))) - (let ((l1_s9 (ite l1_s7 l1_s4 l1_s8))) - (let ((l1_s10 (* l1_s2 l1_s9))) - (let ((l1_s11 (- l1_s3 l1_s10))) - (let ((l1_s12 (> l1_s11 l1_s4))) - (let ((l1_s13 (< l1_s11 l1_s4))) - (let ((l1_s15 (ite l1_s13 l1_s14 l1_s11))) - (let ((l1_s16 (ite l1_s12 l1_s8 l1_s15))) - (let ((l1_s17 (= l1_s14 l1_s16))) - (let ((l1_s18 (+ l1_s2 l1_s11))) - (let ((l1_s19 (ite l1_s17 l1_s18 l1_s11))) - (let ((l1_s20 (distinct l1_s4 l1_s19))) - (let ((l1_s21 (seq.unit l1_s1))) - (let ((l1_s23 (ite l1_s20 l1_s21 l1_s22))) - (let ((l1_s24 (seq.++ l1_s0 l1_s23))) - l1_s24)))))))))))))))))))))))) s4 s0)) + (let ((l1_s2 2)) + (let ((l1_s4 0)) + (let ((l1_s8 1)) + (let ((l1_s14 (- 1))) + (let ((l1_s22 (as seq.empty (Seq Int)))) + (let ((l1_s3 (mod l1_s1 l1_s2))) + (let ((l1_s5 (>= l1_s1 l1_s4))) + (let ((l1_s6 (= l1_s3 l1_s4))) + (let ((l1_s7 (or l1_s5 l1_s6))) + (let ((l1_s9 (ite l1_s7 l1_s4 l1_s8))) + (let ((l1_s10 (* l1_s2 l1_s9))) + (let ((l1_s11 (- l1_s3 l1_s10))) + (let ((l1_s12 (> l1_s11 l1_s4))) + (let ((l1_s13 (< l1_s11 l1_s4))) + (let ((l1_s15 (ite l1_s13 l1_s14 l1_s11))) + (let ((l1_s16 (ite l1_s12 l1_s8 l1_s15))) + (let ((l1_s17 (= l1_s14 l1_s16))) + (let ((l1_s18 (+ l1_s2 l1_s11))) + (let ((l1_s19 (ite l1_s17 l1_s18 l1_s11))) + (let ((l1_s20 (distinct l1_s4 l1_s19))) + (let ((l1_s21 (seq.unit l1_s1))) + (let ((l1_s23 (ite l1_s20 l1_s21 l1_s22))) + (let ((l1_s24 (seq.++ l1_s0 l1_s23))) + l1_s24)))))))))))))))))))))))) s4 s0)) [GOOD] (define-fun s6 () Bool (= s1 s5)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda34.gold b/SBVTestSuite/GoldFiles/lambda34.gold index be49b6b59..f16f4a86a 100644 --- a/SBVTestSuite/GoldFiles/lambda34.gold +++ b/SBVTestSuite/GoldFiles/lambda34.gold @@ -1,4 +1,4 @@ (lambda ((l1_s0 (_ BitVec 8))) - (let ((l1_s1 #x01)) - (let ((l1_s2 (bvadd l1_s0 l1_s1))) - l1_s2))) + (let ((l1_s1 #x01)) + (let ((l1_s2 (bvadd l1_s0 l1_s1))) + l1_s2))) diff --git a/SBVTestSuite/GoldFiles/lambda36.gold b/SBVTestSuite/GoldFiles/lambda36.gold index ed85580e7..eaa3eddfe 100644 --- a/SBVTestSuite/GoldFiles/lambda36.gold +++ b/SBVTestSuite/GoldFiles/lambda36.gold @@ -1,3 +1,3 @@ ; user defined axiom: (assert (forall ((l1_s0 Bool)) - true)) + true)) diff --git a/SBVTestSuite/GoldFiles/lambda38.gold b/SBVTestSuite/GoldFiles/lambda38.gold index 84f191e51..00d37cbaf 100644 --- a/SBVTestSuite/GoldFiles/lambda38.gold +++ b/SBVTestSuite/GoldFiles/lambda38.gold @@ -1,6 +1,6 @@ ; user defined axiom: (assert (forall ((l1_s0 Int) (l1_s1 Bool)) - (let ((l1_s2 0)) - (let ((l1_s3 (= l1_s0 l1_s2))) - (let ((l1_s4 (or l1_s1 l1_s3))) - l1_s4))))) + (let ((l1_s2 0)) + (let ((l1_s3 (= l1_s0 l1_s2))) + (let ((l1_s4 (or l1_s1 l1_s3))) + l1_s4))))) diff --git a/SBVTestSuite/GoldFiles/lambda41.gold b/SBVTestSuite/GoldFiles/lambda41.gold index 955ab5a5e..70e32d926 100644 --- a/SBVTestSuite/GoldFiles/lambda41.gold +++ b/SBVTestSuite/GoldFiles/lambda41.gold @@ -1,5 +1,5 @@ ; lambda41 :: SInteger -> SInteger (define-fun lambda41 ((l1_s0 Int)) Int - (let ((l1_s1 1)) - (let ((l1_s2 (+ l1_s0 l1_s1))) - l1_s2))) + (let ((l1_s1 1)) + (let ((l1_s2 (+ l1_s0 l1_s1))) + l1_s2))) diff --git a/SBVTestSuite/GoldFiles/lambda44.gold b/SBVTestSuite/GoldFiles/lambda44.gold index 7e68cb11a..fa6215d47 100644 --- a/SBVTestSuite/GoldFiles/lambda44.gold +++ b/SBVTestSuite/GoldFiles/lambda44.gold @@ -1,5 +1,5 @@ ; lambda44 :: SWord32 -> SWord32 (define-fun lambda44 ((l1_s0 (_ BitVec 32))) (_ BitVec 32) - (let ((l1_s1 #x00000001)) - (let ((l1_s2 (bvadd l1_s0 l1_s1))) - l1_s2))) + (let ((l1_s1 #x00000001)) + (let ((l1_s2 (bvadd l1_s0 l1_s1))) + l1_s2))) diff --git a/SBVTestSuite/GoldFiles/lambda46.gold b/SBVTestSuite/GoldFiles/lambda46.gold index 2b3792bc5..f402f04ca 100644 --- a/SBVTestSuite/GoldFiles/lambda46.gold +++ b/SBVTestSuite/GoldFiles/lambda46.gold @@ -15,19 +15,16 @@ [GOOD] (declare-fun s0 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; add1 :: SInteger -> SInteger [GOOD] (define-fun add1 ((l1_s0 Int)) Int - (let ((l1_s1 1)) - (let ((l1_s2 (+ l1_s0 l1_s1))) - l1_s2))) + (let ((l1_s1 1)) + (let ((l1_s2 (+ l1_s0 l1_s1))) + l1_s2))) [GOOD] ; --- assignments --- [GOOD] (define-fun s1 () Int (add1 s0)) [GOOD] (define-fun s3 () Bool (= s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/lambda47.gold b/SBVTestSuite/GoldFiles/lambda47.gold index ef6f8c71e..3db921ffd 100644 --- a/SBVTestSuite/GoldFiles/lambda47.gold +++ b/SBVTestSuite/GoldFiles/lambda47.gold @@ -16,26 +16,23 @@ [GOOD] (declare-fun s1 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; sumToN :: SInteger -> SInteger [Recursive] [GOOD] (define-fun-rec sumToN ((l1_s0 Int)) Int - (let ((l1_s1 0)) - (let ((l1_s3 1)) - (let ((l1_s2 (<= l1_s0 l1_s1))) - (let ((l1_s4 (- l1_s0 l1_s3))) - (let ((l1_s5 (sumToN l1_s4))) - (let ((l1_s6 (+ l1_s0 l1_s5))) - (let ((l1_s7 (ite l1_s2 l1_s1 l1_s6))) - l1_s7)))))))) + (let ((l1_s1 0)) + (let ((l1_s3 1)) + (let ((l1_s2 (<= l1_s0 l1_s1))) + (let ((l1_s4 (- l1_s0 l1_s3))) + (let ((l1_s5 (sumToN l1_s4))) + (let ((l1_s6 (+ l1_s0 l1_s5))) + (let ((l1_s7 (ite l1_s2 l1_s1 l1_s6))) + l1_s7)))))))) [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () Int (sumToN s0)) [GOOD] (define-fun s5 () Bool (= s1 s4)) [GOOD] (define-fun s6 () Bool (and s3 s5)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s6) diff --git a/SBVTestSuite/GoldFiles/lambda47_c.gold b/SBVTestSuite/GoldFiles/lambda47_c.gold index 50f00c67f..2470d1b72 100644 --- a/SBVTestSuite/GoldFiles/lambda47_c.gold +++ b/SBVTestSuite/GoldFiles/lambda47_c.gold @@ -15,13 +15,10 @@ [GOOD] (declare-fun s0 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s2 () Bool (= s0 s1)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s2) diff --git a/SBVTestSuite/GoldFiles/lambda48.gold b/SBVTestSuite/GoldFiles/lambda48.gold index 87316c909..b70b01837 100644 --- a/SBVTestSuite/GoldFiles/lambda48.gold +++ b/SBVTestSuite/GoldFiles/lambda48.gold @@ -19,28 +19,25 @@ [GOOD] (declare-fun s1 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; list_length :: [SInteger] -> SInteger [Recursive] [GOOD] (define-fun-rec list_length ((l1_s0 (Seq Int))) Int - (let ((l1_s2 0)) - (let ((l1_s4 1)) - (let ((l1_s1 (seq.len l1_s0))) - (let ((l1_s3 (= l1_s1 l1_s2))) - (let ((l1_s5 (- l1_s1 l1_s4))) - (let ((l1_s6 (seq.extract l1_s0 l1_s4 l1_s5))) - (let ((l1_s7 (list_length l1_s6))) - (let ((l1_s8 (+ l1_s4 l1_s7))) - (let ((l1_s9 (ite l1_s3 l1_s2 l1_s8))) - l1_s9)))))))))) + (let ((l1_s2 0)) + (let ((l1_s4 1)) + (let ((l1_s1 (seq.len l1_s0))) + (let ((l1_s3 (= l1_s1 l1_s2))) + (let ((l1_s5 (- l1_s1 l1_s4))) + (let ((l1_s6 (seq.extract l1_s0 l1_s4 l1_s5))) + (let ((l1_s7 (list_length l1_s6))) + (let ((l1_s8 (+ l1_s4 l1_s7))) + (let ((l1_s9 (ite l1_s3 l1_s2 l1_s8))) + l1_s9)))))))))) [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () Int (list_length s0)) [GOOD] (define-fun s5 () Bool (= s1 s4)) [GOOD] (define-fun s6 () Bool (and s3 s5)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s6) diff --git a/SBVTestSuite/GoldFiles/lambda48_c.gold b/SBVTestSuite/GoldFiles/lambda48_c.gold index 0a12d1740..fdc3e032f 100644 --- a/SBVTestSuite/GoldFiles/lambda48_c.gold +++ b/SBVTestSuite/GoldFiles/lambda48_c.gold @@ -15,13 +15,10 @@ [GOOD] (declare-fun s0 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s2 () Bool (= s0 s1)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s2) diff --git a/SBVTestSuite/GoldFiles/lambda49.gold b/SBVTestSuite/GoldFiles/lambda49.gold index 2e403f7bb..65739da9b 100644 --- a/SBVTestSuite/GoldFiles/lambda49.gold +++ b/SBVTestSuite/GoldFiles/lambda49.gold @@ -22,34 +22,31 @@ [GOOD] (declare-fun s1 () Bool) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; isEvenOdd :: SInteger -> (SBool, SBool) [Recursive] [GOOD] (define-fun-rec isEvenOdd ((l1_s0 Int)) (SBVTuple2 Bool Bool) - (let ((l1_s1 0)) - (let ((l1_s6 (mkSBVTuple2 true false))) - (let ((l1_s7 1)) - (let ((l1_s2 (< l1_s0 l1_s1))) - (let ((l1_s3 (- l1_s0))) - (let ((l1_s4 (isEvenOdd l1_s3))) - (let ((l1_s5 (= l1_s0 l1_s1))) - (let ((l1_s8 (- l1_s0 l1_s7))) - (let ((l1_s9 (isEvenOdd l1_s8))) - (let ((l1_s10 (proj_2_SBVTuple2 l1_s9))) - (let ((l1_s11 (proj_1_SBVTuple2 l1_s9))) - (let ((l1_s12 ((as mkSBVTuple2 (SBVTuple2 Bool Bool)) l1_s10 l1_s11))) - (let ((l1_s13 (ite l1_s5 l1_s6 l1_s12))) - (let ((l1_s14 (ite l1_s2 l1_s4 l1_s13))) - l1_s14))))))))))))))) + (let ((l1_s1 0)) + (let ((l1_s6 (mkSBVTuple2 true false))) + (let ((l1_s7 1)) + (let ((l1_s2 (< l1_s0 l1_s1))) + (let ((l1_s3 (- l1_s0))) + (let ((l1_s4 (isEvenOdd l1_s3))) + (let ((l1_s5 (= l1_s0 l1_s1))) + (let ((l1_s8 (- l1_s0 l1_s7))) + (let ((l1_s9 (isEvenOdd l1_s8))) + (let ((l1_s10 (proj_2_SBVTuple2 l1_s9))) + (let ((l1_s11 (proj_1_SBVTuple2 l1_s9))) + (let ((l1_s12 ((as mkSBVTuple2 (SBVTuple2 Bool Bool)) l1_s10 l1_s11))) + (let ((l1_s13 (ite l1_s5 l1_s6 l1_s12))) + (let ((l1_s14 (ite l1_s2 l1_s4 l1_s13))) + l1_s14))))))))))))))) [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () (SBVTuple2 Bool Bool) (isEvenOdd s0)) [GOOD] (define-fun s5 () Bool (proj_1_SBVTuple2 s4)) [GOOD] (define-fun s6 () Bool (= s1 s5)) [GOOD] (define-fun s7 () Bool (and s3 s6)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s7) diff --git a/SBVTestSuite/GoldFiles/lambda49_c.gold b/SBVTestSuite/GoldFiles/lambda49_c.gold index 147a1897c..800b2ccb5 100644 --- a/SBVTestSuite/GoldFiles/lambda49_c.gold +++ b/SBVTestSuite/GoldFiles/lambda49_c.gold @@ -14,12 +14,9 @@ [GOOD] (declare-fun s0 () Bool) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/lambda50.gold b/SBVTestSuite/GoldFiles/lambda50.gold index d5e1e1f6f..2b1f7df35 100644 --- a/SBVTestSuite/GoldFiles/lambda50.gold +++ b/SBVTestSuite/GoldFiles/lambda50.gold @@ -22,34 +22,31 @@ [GOOD] (declare-fun s1 () Bool) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; isEvenOdd :: SInteger -> (SBool, SBool) [Recursive] [GOOD] (define-fun-rec isEvenOdd ((l1_s0 Int)) (SBVTuple2 Bool Bool) - (let ((l1_s1 0)) - (let ((l1_s6 (mkSBVTuple2 true false))) - (let ((l1_s7 1)) - (let ((l1_s2 (< l1_s0 l1_s1))) - (let ((l1_s3 (- l1_s0))) - (let ((l1_s4 (isEvenOdd l1_s3))) - (let ((l1_s5 (= l1_s0 l1_s1))) - (let ((l1_s8 (- l1_s0 l1_s7))) - (let ((l1_s9 (isEvenOdd l1_s8))) - (let ((l1_s10 (proj_2_SBVTuple2 l1_s9))) - (let ((l1_s11 (proj_1_SBVTuple2 l1_s9))) - (let ((l1_s12 ((as mkSBVTuple2 (SBVTuple2 Bool Bool)) l1_s10 l1_s11))) - (let ((l1_s13 (ite l1_s5 l1_s6 l1_s12))) - (let ((l1_s14 (ite l1_s2 l1_s4 l1_s13))) - l1_s14))))))))))))))) + (let ((l1_s1 0)) + (let ((l1_s6 (mkSBVTuple2 true false))) + (let ((l1_s7 1)) + (let ((l1_s2 (< l1_s0 l1_s1))) + (let ((l1_s3 (- l1_s0))) + (let ((l1_s4 (isEvenOdd l1_s3))) + (let ((l1_s5 (= l1_s0 l1_s1))) + (let ((l1_s8 (- l1_s0 l1_s7))) + (let ((l1_s9 (isEvenOdd l1_s8))) + (let ((l1_s10 (proj_2_SBVTuple2 l1_s9))) + (let ((l1_s11 (proj_1_SBVTuple2 l1_s9))) + (let ((l1_s12 ((as mkSBVTuple2 (SBVTuple2 Bool Bool)) l1_s10 l1_s11))) + (let ((l1_s13 (ite l1_s5 l1_s6 l1_s12))) + (let ((l1_s14 (ite l1_s2 l1_s4 l1_s13))) + l1_s14))))))))))))))) [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () (SBVTuple2 Bool Bool) (isEvenOdd s0)) [GOOD] (define-fun s5 () Bool (proj_1_SBVTuple2 s4)) [GOOD] (define-fun s6 () Bool (= s1 s5)) [GOOD] (define-fun s7 () Bool (and s3 s6)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s7) diff --git a/SBVTestSuite/GoldFiles/lambda50_c.gold b/SBVTestSuite/GoldFiles/lambda50_c.gold index c131f60ee..eb28a26a0 100644 --- a/SBVTestSuite/GoldFiles/lambda50_c.gold +++ b/SBVTestSuite/GoldFiles/lambda50_c.gold @@ -14,18 +14,15 @@ [GOOD] (declare-fun s0 () Bool) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] (define-fun s1 () Bool (= false s0)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- +[GOOD] (define-fun s1 () Bool (not s0)) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s1) [GOOD] (declare-fun s2 () Bool) -[GOOD] (define-fun s3 () Bool (= false s2)) +[GOOD] (define-fun s3 () Bool (not s2)) [GOOD] (assert s3) [SEND] (check-sat) [RECV] sat diff --git a/SBVTestSuite/GoldFiles/lambda51.gold b/SBVTestSuite/GoldFiles/lambda51.gold index 5ecb05ff3..1fc7fa4f0 100644 --- a/SBVTestSuite/GoldFiles/lambda51.gold +++ b/SBVTestSuite/GoldFiles/lambda51.gold @@ -22,34 +22,31 @@ [GOOD] (declare-fun s1 () Bool) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; isEvenOdd :: SInteger -> (SBool, SBool) [Recursive] [GOOD] (define-fun-rec isEvenOdd ((l1_s0 Int)) (SBVTuple2 Bool Bool) - (let ((l1_s1 0)) - (let ((l1_s6 (mkSBVTuple2 true false))) - (let ((l1_s7 1)) - (let ((l1_s2 (< l1_s0 l1_s1))) - (let ((l1_s3 (- l1_s0))) - (let ((l1_s4 (isEvenOdd l1_s3))) - (let ((l1_s5 (= l1_s0 l1_s1))) - (let ((l1_s8 (- l1_s0 l1_s7))) - (let ((l1_s9 (isEvenOdd l1_s8))) - (let ((l1_s10 (proj_2_SBVTuple2 l1_s9))) - (let ((l1_s11 (proj_1_SBVTuple2 l1_s9))) - (let ((l1_s12 ((as mkSBVTuple2 (SBVTuple2 Bool Bool)) l1_s10 l1_s11))) - (let ((l1_s13 (ite l1_s5 l1_s6 l1_s12))) - (let ((l1_s14 (ite l1_s2 l1_s4 l1_s13))) - l1_s14))))))))))))))) + (let ((l1_s1 0)) + (let ((l1_s6 (mkSBVTuple2 true false))) + (let ((l1_s7 1)) + (let ((l1_s2 (< l1_s0 l1_s1))) + (let ((l1_s3 (- l1_s0))) + (let ((l1_s4 (isEvenOdd l1_s3))) + (let ((l1_s5 (= l1_s0 l1_s1))) + (let ((l1_s8 (- l1_s0 l1_s7))) + (let ((l1_s9 (isEvenOdd l1_s8))) + (let ((l1_s10 (proj_2_SBVTuple2 l1_s9))) + (let ((l1_s11 (proj_1_SBVTuple2 l1_s9))) + (let ((l1_s12 ((as mkSBVTuple2 (SBVTuple2 Bool Bool)) l1_s10 l1_s11))) + (let ((l1_s13 (ite l1_s5 l1_s6 l1_s12))) + (let ((l1_s14 (ite l1_s2 l1_s4 l1_s13))) + l1_s14))))))))))))))) [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () (SBVTuple2 Bool Bool) (isEvenOdd s0)) [GOOD] (define-fun s5 () Bool (proj_2_SBVTuple2 s4)) [GOOD] (define-fun s6 () Bool (= s1 s5)) [GOOD] (define-fun s7 () Bool (and s3 s6)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s7) diff --git a/SBVTestSuite/GoldFiles/lambda51_c.gold b/SBVTestSuite/GoldFiles/lambda51_c.gold index c131f60ee..eb28a26a0 100644 --- a/SBVTestSuite/GoldFiles/lambda51_c.gold +++ b/SBVTestSuite/GoldFiles/lambda51_c.gold @@ -14,18 +14,15 @@ [GOOD] (declare-fun s0 () Bool) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] (define-fun s1 () Bool (= false s0)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- +[GOOD] (define-fun s1 () Bool (not s0)) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s1) [GOOD] (declare-fun s2 () Bool) -[GOOD] (define-fun s3 () Bool (= false s2)) +[GOOD] (define-fun s3 () Bool (not s2)) [GOOD] (assert s3) [SEND] (check-sat) [RECV] sat diff --git a/SBVTestSuite/GoldFiles/lambda52.gold b/SBVTestSuite/GoldFiles/lambda52.gold index 2653063b9..c16b9572c 100644 --- a/SBVTestSuite/GoldFiles/lambda52.gold +++ b/SBVTestSuite/GoldFiles/lambda52.gold @@ -22,34 +22,31 @@ [GOOD] (declare-fun s1 () Bool) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; isEvenOdd :: SInteger -> (SBool, SBool) [Recursive] [GOOD] (define-fun-rec isEvenOdd ((l1_s0 Int)) (SBVTuple2 Bool Bool) - (let ((l1_s1 0)) - (let ((l1_s6 (mkSBVTuple2 true false))) - (let ((l1_s7 1)) - (let ((l1_s2 (< l1_s0 l1_s1))) - (let ((l1_s3 (- l1_s0))) - (let ((l1_s4 (isEvenOdd l1_s3))) - (let ((l1_s5 (= l1_s0 l1_s1))) - (let ((l1_s8 (- l1_s0 l1_s7))) - (let ((l1_s9 (isEvenOdd l1_s8))) - (let ((l1_s10 (proj_2_SBVTuple2 l1_s9))) - (let ((l1_s11 (proj_1_SBVTuple2 l1_s9))) - (let ((l1_s12 ((as mkSBVTuple2 (SBVTuple2 Bool Bool)) l1_s10 l1_s11))) - (let ((l1_s13 (ite l1_s5 l1_s6 l1_s12))) - (let ((l1_s14 (ite l1_s2 l1_s4 l1_s13))) - l1_s14))))))))))))))) + (let ((l1_s1 0)) + (let ((l1_s6 (mkSBVTuple2 true false))) + (let ((l1_s7 1)) + (let ((l1_s2 (< l1_s0 l1_s1))) + (let ((l1_s3 (- l1_s0))) + (let ((l1_s4 (isEvenOdd l1_s3))) + (let ((l1_s5 (= l1_s0 l1_s1))) + (let ((l1_s8 (- l1_s0 l1_s7))) + (let ((l1_s9 (isEvenOdd l1_s8))) + (let ((l1_s10 (proj_2_SBVTuple2 l1_s9))) + (let ((l1_s11 (proj_1_SBVTuple2 l1_s9))) + (let ((l1_s12 ((as mkSBVTuple2 (SBVTuple2 Bool Bool)) l1_s10 l1_s11))) + (let ((l1_s13 (ite l1_s5 l1_s6 l1_s12))) + (let ((l1_s14 (ite l1_s2 l1_s4 l1_s13))) + l1_s14))))))))))))))) [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () (SBVTuple2 Bool Bool) (isEvenOdd s0)) [GOOD] (define-fun s5 () Bool (proj_2_SBVTuple2 s4)) [GOOD] (define-fun s6 () Bool (= s1 s5)) [GOOD] (define-fun s7 () Bool (and s3 s6)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s7) diff --git a/SBVTestSuite/GoldFiles/lambda52_c.gold b/SBVTestSuite/GoldFiles/lambda52_c.gold index 147a1897c..800b2ccb5 100644 --- a/SBVTestSuite/GoldFiles/lambda52_c.gold +++ b/SBVTestSuite/GoldFiles/lambda52_c.gold @@ -14,12 +14,9 @@ [GOOD] (declare-fun s0 () Bool) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/lambda53.gold b/SBVTestSuite/GoldFiles/lambda53.gold index 7e1854dd8..22b56a501 100644 --- a/SBVTestSuite/GoldFiles/lambda53.gold +++ b/SBVTestSuite/GoldFiles/lambda53.gold @@ -14,7 +14,6 @@ [GOOD] (declare-fun s0 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; foo :: SInteger -> SInteger @@ -23,8 +22,6 @@ [GOOD] ; --- assignments --- [GOOD] (define-fun s1 () Int (foo s0)) [GOOD] (define-fun s2 () Bool (= s0 s1)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s2) diff --git a/SBVTestSuite/GoldFiles/lambda54.gold b/SBVTestSuite/GoldFiles/lambda54.gold index c80e5a376..7dacadd90 100644 --- a/SBVTestSuite/GoldFiles/lambda54.gold +++ b/SBVTestSuite/GoldFiles/lambda54.gold @@ -14,27 +14,24 @@ [GOOD] (declare-fun s0 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; bar :: SInteger -> SInteger [GOOD] (define-fun bar ((l1_s0 Int)) Int - (let ((l1_s1 1)) - (let ((l1_s2 (+ l1_s0 l1_s1))) - l1_s2))) + (let ((l1_s1 1)) + (let ((l1_s2 (+ l1_s0 l1_s1))) + l1_s2))) [GOOD] ; foo :: SInteger -> SInteger [Refers to: bar] [GOOD] (define-fun foo ((l1_s0 Int)) Int - (let ((l1_s2 1)) - (let ((l1_s1 (bar l1_s0))) - (let ((l1_s3 (+ l1_s1 l1_s2))) - l1_s3)))) + (let ((l1_s2 1)) + (let ((l1_s1 (bar l1_s0))) + (let ((l1_s3 (+ l1_s1 l1_s2))) + l1_s3)))) [GOOD] ; --- assignments --- [GOOD] (define-fun s1 () Int (bar s0)) [GOOD] (define-fun s2 () Int (foo s0)) [GOOD] (define-fun s3 () Int (+ s1 s2)) [GOOD] (define-fun s4 () Bool (= s0 s3)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s4) diff --git a/SBVTestSuite/GoldFiles/lambda55.gold b/SBVTestSuite/GoldFiles/lambda55.gold index 4d3d1aea3..3ad842947 100644 --- a/SBVTestSuite/GoldFiles/lambda55.gold +++ b/SBVTestSuite/GoldFiles/lambda55.gold @@ -14,27 +14,24 @@ [GOOD] (declare-fun s0 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; bar :: SInteger -> SInteger [GOOD] (define-fun bar ((l2_s0 Int)) Int - (let ((l2_s1 1)) - (let ((l2_s2 (+ l2_s0 l2_s1))) - l2_s2))) + (let ((l2_s1 1)) + (let ((l2_s2 (+ l2_s0 l2_s1))) + l2_s2))) [GOOD] ; foo :: SInteger -> SInteger [Refers to: bar] [GOOD] (define-fun foo ((l1_s0 Int)) Int - (let ((l1_s2 1)) - (let ((l1_s1 (bar l1_s0))) - (let ((l1_s3 (+ l1_s1 l1_s2))) - l1_s3)))) + (let ((l1_s2 1)) + (let ((l1_s1 (bar l1_s0))) + (let ((l1_s3 (+ l1_s1 l1_s2))) + l1_s3)))) [GOOD] ; --- assignments --- [GOOD] (define-fun s1 () Int (foo s0)) [GOOD] (define-fun s2 () Int (bar s0)) [GOOD] (define-fun s3 () Int (+ s1 s2)) [GOOD] (define-fun s4 () Bool (= s0 s3)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s4) diff --git a/SBVTestSuite/GoldFiles/lambda56.gold b/SBVTestSuite/GoldFiles/lambda56.gold index 14492a3e9..c57566e57 100644 --- a/SBVTestSuite/GoldFiles/lambda56.gold +++ b/SBVTestSuite/GoldFiles/lambda56.gold @@ -14,7 +14,6 @@ [GOOD] (declare-fun s0 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; bar :: SInteger -> SInteger, foo :: SInteger -> SInteger @@ -22,22 +21,20 @@ ((bar ((l2_s0 Int)) Int) (foo ((l1_s0 Int)) Int)) (; Definition of: bar :: SInteger -> SInteger. [Refers to: foo] - (let ((l2_s2 1)) - (let ((l2_s1 (foo l2_s0))) - (let ((l2_s3 (+ l2_s1 l2_s2))) - l2_s3))) + (let ((l2_s2 1)) + (let ((l2_s1 (foo l2_s0))) + (let ((l2_s3 (+ l2_s1 l2_s2))) + l2_s3))) ; Definition of: foo :: SInteger -> SInteger. [Refers to: bar] - (let ((l1_s2 1)) - (let ((l1_s1 (bar l1_s0))) - (let ((l1_s3 (+ l1_s1 l1_s2))) - l1_s3))))) + (let ((l1_s2 1)) + (let ((l1_s1 (bar l1_s0))) + (let ((l1_s3 (+ l1_s1 l1_s2))) + l1_s3))))) [GOOD] ; --- assignments --- [GOOD] (define-fun s1 () Int (foo s0)) [GOOD] (define-fun s2 () Int (bar s0)) [GOOD] (define-fun s3 () Int (+ s1 s2)) [GOOD] (define-fun s4 () Bool (= s0 s3)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s4) diff --git a/SBVTestSuite/GoldFiles/lambda57.gold b/SBVTestSuite/GoldFiles/lambda57.gold index 4b76c5934..7ad3095aa 100644 --- a/SBVTestSuite/GoldFiles/lambda57.gold +++ b/SBVTestSuite/GoldFiles/lambda57.gold @@ -14,7 +14,6 @@ [GOOD] (declare-fun s0 () (_ BitVec 8)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; f1 :: SWord8 -> SWord8, f2 :: SWord8 -> SWord8, f3 :: SWord8 -> SWord8, f4 :: SWord8 -> SWord8 @@ -24,62 +23,60 @@ (f3 ((l3_s0 (_ BitVec 8))) (_ BitVec 8)) (f4 ((l4_s0 (_ BitVec 8))) (_ BitVec 8))) (; Definition of: f1 :: SWord8 -> SWord8. [Refers to: f1, f2] - (let ((l1_s1 #x00)) - (let ((l1_s3 #x01)) - (let ((l1_s6 #x02)) - (let ((l1_s2 (= l1_s0 l1_s1))) - (let ((l1_s4 (bvsub l1_s0 l1_s3))) - (let ((l1_s5 (f1 l1_s4))) - (let ((l1_s7 (bvsub l1_s0 l1_s6))) - (let ((l1_s8 (f2 l1_s7))) - (let ((l1_s9 (bvadd l1_s5 l1_s8))) - (let ((l1_s10 (bvadd l1_s3 l1_s9))) - (let ((l1_s11 (ite l1_s2 l1_s1 l1_s10))) - l1_s11))))))))))) + (let ((l1_s1 #x00)) + (let ((l1_s3 #x01)) + (let ((l1_s6 #x02)) + (let ((l1_s2 (= l1_s0 l1_s1))) + (let ((l1_s4 (bvsub l1_s0 l1_s3))) + (let ((l1_s5 (f1 l1_s4))) + (let ((l1_s7 (bvsub l1_s0 l1_s6))) + (let ((l1_s8 (f2 l1_s7))) + (let ((l1_s9 (bvadd l1_s5 l1_s8))) + (let ((l1_s10 (bvadd l1_s3 l1_s9))) + (let ((l1_s11 (ite l1_s2 l1_s1 l1_s10))) + l1_s11))))))))))) ; Definition of: f2 :: SWord8 -> SWord8. [Refers to: f2, f3] - (let ((l2_s1 #x00)) - (let ((l2_s3 #x01)) - (let ((l2_s6 #x02)) - (let ((l2_s2 (= l2_s0 l2_s1))) - (let ((l2_s4 (bvsub l2_s0 l2_s3))) - (let ((l2_s5 (f2 l2_s4))) - (let ((l2_s7 (bvsub l2_s0 l2_s6))) - (let ((l2_s8 (f3 l2_s7))) - (let ((l2_s9 (bvadd l2_s5 l2_s8))) - (let ((l2_s10 (bvadd l2_s3 l2_s9))) - (let ((l2_s11 (ite l2_s2 l2_s1 l2_s10))) - l2_s11))))))))))) + (let ((l2_s1 #x00)) + (let ((l2_s3 #x01)) + (let ((l2_s6 #x02)) + (let ((l2_s2 (= l2_s0 l2_s1))) + (let ((l2_s4 (bvsub l2_s0 l2_s3))) + (let ((l2_s5 (f2 l2_s4))) + (let ((l2_s7 (bvsub l2_s0 l2_s6))) + (let ((l2_s8 (f3 l2_s7))) + (let ((l2_s9 (bvadd l2_s5 l2_s8))) + (let ((l2_s10 (bvadd l2_s3 l2_s9))) + (let ((l2_s11 (ite l2_s2 l2_s1 l2_s10))) + l2_s11))))))))))) ; Definition of: f3 :: SWord8 -> SWord8. [Refers to: f3, f4] - (let ((l3_s1 #x00)) - (let ((l3_s3 #x01)) - (let ((l3_s6 #x02)) - (let ((l3_s2 (= l3_s0 l3_s1))) - (let ((l3_s4 (bvsub l3_s0 l3_s3))) - (let ((l3_s5 (f3 l3_s4))) - (let ((l3_s7 (bvsub l3_s0 l3_s6))) - (let ((l3_s8 (f4 l3_s7))) - (let ((l3_s9 (bvadd l3_s5 l3_s8))) - (let ((l3_s10 (bvadd l3_s3 l3_s9))) - (let ((l3_s11 (ite l3_s2 l3_s1 l3_s10))) - l3_s11))))))))))) + (let ((l3_s1 #x00)) + (let ((l3_s3 #x01)) + (let ((l3_s6 #x02)) + (let ((l3_s2 (= l3_s0 l3_s1))) + (let ((l3_s4 (bvsub l3_s0 l3_s3))) + (let ((l3_s5 (f3 l3_s4))) + (let ((l3_s7 (bvsub l3_s0 l3_s6))) + (let ((l3_s8 (f4 l3_s7))) + (let ((l3_s9 (bvadd l3_s5 l3_s8))) + (let ((l3_s10 (bvadd l3_s3 l3_s9))) + (let ((l3_s11 (ite l3_s2 l3_s1 l3_s10))) + l3_s11))))))))))) ; Definition of: f4 :: SWord8 -> SWord8. [Refers to: f4, f1] - (let ((l4_s1 #x00)) - (let ((l4_s3 #x01)) - (let ((l4_s6 #x02)) - (let ((l4_s2 (= l4_s0 l4_s1))) - (let ((l4_s4 (bvsub l4_s0 l4_s3))) - (let ((l4_s5 (f4 l4_s4))) - (let ((l4_s7 (bvsub l4_s0 l4_s6))) - (let ((l4_s8 (f1 l4_s7))) - (let ((l4_s9 (bvadd l4_s5 l4_s8))) - (let ((l4_s10 (bvadd l4_s3 l4_s9))) - (let ((l4_s11 (ite l4_s2 l4_s1 l4_s10))) - l4_s11))))))))))))) + (let ((l4_s1 #x00)) + (let ((l4_s3 #x01)) + (let ((l4_s6 #x02)) + (let ((l4_s2 (= l4_s0 l4_s1))) + (let ((l4_s4 (bvsub l4_s0 l4_s3))) + (let ((l4_s5 (f4 l4_s4))) + (let ((l4_s7 (bvsub l4_s0 l4_s6))) + (let ((l4_s8 (f1 l4_s7))) + (let ((l4_s9 (bvadd l4_s5 l4_s8))) + (let ((l4_s10 (bvadd l4_s3 l4_s9))) + (let ((l4_s11 (ite l4_s2 l4_s1 l4_s10))) + l4_s11))))))))))))) [GOOD] ; --- assignments --- [GOOD] (define-fun s1 () (_ BitVec 8) (f1 s0)) [GOOD] (define-fun s2 () Bool (= s0 s1)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s2) diff --git a/SBVTestSuite/GoldFiles/lambda58.gold b/SBVTestSuite/GoldFiles/lambda58.gold index f2aa1a782..7f5b8ed3b 100644 --- a/SBVTestSuite/GoldFiles/lambda58.gold +++ b/SBVTestSuite/GoldFiles/lambda58.gold @@ -1,5 +1,5 @@ ; user defined axiom: (assert (forall ((l1_s0 Bool)) (exists ((l1_s1 Bool)) - (let ((l1_s2 (not l1_s0))) - (let ((l1_s3 (or l1_s1 l1_s2))) - l1_s3))))) + (let ((l1_s2 (not l1_s0))) + (let ((l1_s3 (or l1_s1 l1_s2))) + l1_s3))))) diff --git a/SBVTestSuite/GoldFiles/lambda59.gold b/SBVTestSuite/GoldFiles/lambda59.gold index 55e728755..88b7f1cd0 100644 --- a/SBVTestSuite/GoldFiles/lambda59.gold +++ b/SBVTestSuite/GoldFiles/lambda59.gold @@ -1,6 +1,6 @@ ; user defined axiom: (assert (forall ((l1_s0 Int)) (exists ((l1_s1 Bool)) - (let ((l1_s2 0)) - (let ((l1_s3 (= l1_s0 l1_s2))) - (let ((l1_s4 (or l1_s1 l1_s3))) - l1_s4)))))) + (let ((l1_s2 0)) + (let ((l1_s3 (= l1_s0 l1_s2))) + (let ((l1_s4 (or l1_s1 l1_s3))) + l1_s4)))))) diff --git a/SBVTestSuite/GoldFiles/lambda60.gold b/SBVTestSuite/GoldFiles/lambda60.gold index d0c97c616..715effbd4 100644 --- a/SBVTestSuite/GoldFiles/lambda60.gold +++ b/SBVTestSuite/GoldFiles/lambda60.gold @@ -13,16 +13,13 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 Int)) (exists ((l1_s1 Int) (l1_s2 Int)) - (let ((l1_s3 (+ l1_s0 l1_s2))) - (let ((l1_s4 (> l1_s1 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s3 (+ l1_s0 l1_s2))) + (let ((l1_s4 (> l1_s1 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/lambda61.gold b/SBVTestSuite/GoldFiles/lambda61.gold index 115ee6fdb..dfa3f0fc5 100644 --- a/SBVTestSuite/GoldFiles/lambda61.gold +++ b/SBVTestSuite/GoldFiles/lambda61.gold @@ -13,14 +13,11 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8))) (exists ((l1_s1 (_ BitVec 8))) (bvugt l1_s1 l1_s0)))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/lambda62.gold b/SBVTestSuite/GoldFiles/lambda62.gold index 75a0713ff..86bf3c58d 100644 --- a/SBVTestSuite/GoldFiles/lambda62.gold +++ b/SBVTestSuite/GoldFiles/lambda62.gold @@ -15,18 +15,15 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] (declare-fun D (P) Bool) [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 P)) (forall ((l1_s1 P)) - (let ((l1_s2 (D l1_s0))) - (let ((l1_s3 (D l1_s1))) - (let ((l1_s4 (=> l1_s2 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (D l1_s0))) + (let ((l1_s3 (D l1_s1))) + (let ((l1_s4 (=> l1_s2 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (not s0)) diff --git a/SBVTestSuite/GoldFiles/lambda63.gold b/SBVTestSuite/GoldFiles/lambda63.gold index be5e18eeb..7f7f1b618 100644 --- a/SBVTestSuite/GoldFiles/lambda63.gold +++ b/SBVTestSuite/GoldFiles/lambda63.gold @@ -13,15 +13,12 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] (declare-fun R (Int Int) Bool) [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 Int)) (R l1_s0 l1_s0))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (not s0)) diff --git a/SBVTestSuite/GoldFiles/lambda64.gold b/SBVTestSuite/GoldFiles/lambda64.gold index ba4bcc9f3..d29cc9bdb 100644 --- a/SBVTestSuite/GoldFiles/lambda64.gold +++ b/SBVTestSuite/GoldFiles/lambda64.gold @@ -13,23 +13,20 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] (declare-fun R (Int Int) Bool) [GOOD] (declare-fun __internal_sbv_IsPartialOrder__poR_ (Int Int) Bool) [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 Int) (l1_s1 Int)) - (let ((l1_s2 (R l1_s0 l1_s1))) - (let ((l1_s3 (__internal_sbv_IsPartialOrder__poR_ l1_s0 l1_s1))) - (let ((l1_s4 (= l1_s2 l1_s3))) - l1_s4))))) + (let ((l1_s2 (R l1_s0 l1_s1))) + (let ((l1_s3 (__internal_sbv_IsPartialOrder__poR_ l1_s0 l1_s1))) + (let ((l1_s4 (= l1_s2 l1_s3))) + l1_s4))))) [GOOD] (define-fun s1 () Bool (forall ((x Int) (y Int)) (= (__internal_sbv_IsPartialOrder__poR_ x y) ((_ partial-order 0) x y)))) [GOOD] (define-fun s2 () Bool (forall ((l1_s0 Int)) (R l1_s0 l1_s0))) [GOOD] (define-fun s3 () Bool (=> s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/lambda65.gold b/SBVTestSuite/GoldFiles/lambda65.gold index 3543dc9fe..258fdb80a 100644 --- a/SBVTestSuite/GoldFiles/lambda65.gold +++ b/SBVTestSuite/GoldFiles/lambda65.gold @@ -13,7 +13,6 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] (declare-fun __internal_sbv_IsPartialOrder__poI_ (Int Int) Bool) [GOOD] ; --- user defined functions --- @@ -22,16 +21,14 @@ (<= l2_s0 l2_s1)) [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 Int) (l1_s1 Int)) - (let ((l1_s2 (leq l1_s0 l1_s1))) - (let ((l1_s3 (__internal_sbv_IsPartialOrder__poI_ l1_s0 l1_s1))) - (let ((l1_s4 (= l1_s2 l1_s3))) - l1_s4))))) + (let ((l1_s2 (leq l1_s0 l1_s1))) + (let ((l1_s3 (__internal_sbv_IsPartialOrder__poI_ l1_s0 l1_s1))) + (let ((l1_s4 (= l1_s2 l1_s3))) + l1_s4))))) [GOOD] (define-fun s1 () Bool (forall ((x Int) (y Int)) (= (__internal_sbv_IsPartialOrder__poI_ x y) ((_ partial-order 0) x y)))) [GOOD] (define-fun s2 () Bool (forall ((l1_s0 Int)) (leq l1_s0 l1_s0))) [GOOD] (define-fun s3 () Bool (=> s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/lambda66.gold b/SBVTestSuite/GoldFiles/lambda66.gold index 8ebec1ea9..8529f88ee 100644 --- a/SBVTestSuite/GoldFiles/lambda66.gold +++ b/SBVTestSuite/GoldFiles/lambda66.gold @@ -13,7 +13,6 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] (declare-fun U (Int Int) Bool) [GOOD] (declare-fun __internal_sbv__TransitiveClosure_tcU_ (Int Int) Bool) @@ -22,19 +21,17 @@ [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 Int) (l1_s1 Int)) - (let ((l1_s2 (U l1_s0 l1_s1))) - (let ((l1_s3 (__internal_sbv__TransitiveClosure_tcU_ l1_s0 l1_s1))) - (let ((l1_s4 (= l1_s2 l1_s3))) - l1_s4))))) + (let ((l1_s2 (U l1_s0 l1_s1))) + (let ((l1_s3 (__internal_sbv__TransitiveClosure_tcU_ l1_s0 l1_s1))) + (let ((l1_s4 (= l1_s2 l1_s3))) + l1_s4))))) [GOOD] (define-fun s1 () Bool (forall ((l1_s0 Int) (l1_s1 Int) (l1_s2 Int)) - (let ((l1_s3 (U l1_s0 l1_s1))) - (let ((l1_s4 (U l1_s1 l1_s2))) - (let ((l1_s5 (and l1_s3 l1_s4))) - (let ((l1_s6 (tcU l1_s0 l1_s2))) - (let ((l1_s7 (=> l1_s5 l1_s6))) - l1_s7))))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s3 (U l1_s0 l1_s1))) + (let ((l1_s4 (U l1_s1 l1_s2))) + (let ((l1_s5 (and l1_s3 l1_s4))) + (let ((l1_s6 (tcU l1_s0 l1_s2))) + (let ((l1_s7 (=> l1_s5 l1_s6))) + l1_s7))))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/lambda67.gold b/SBVTestSuite/GoldFiles/lambda67.gold index 8b56f9319..47c126d0e 100644 --- a/SBVTestSuite/GoldFiles/lambda67.gold +++ b/SBVTestSuite/GoldFiles/lambda67.gold @@ -13,7 +13,6 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] (declare-fun U ((_ BitVec 8) (_ BitVec 8)) Bool) [GOOD] (declare-fun __internal_sbv__TransitiveClosure_tcU_ ((_ BitVec 8) (_ BitVec 8)) Bool) @@ -22,19 +21,17 @@ [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 (U l1_s0 l1_s1))) - (let ((l1_s3 (__internal_sbv__TransitiveClosure_tcU_ l1_s0 l1_s1))) - (let ((l1_s4 (= l1_s2 l1_s3))) - l1_s4))))) + (let ((l1_s2 (U l1_s0 l1_s1))) + (let ((l1_s3 (__internal_sbv__TransitiveClosure_tcU_ l1_s0 l1_s1))) + (let ((l1_s4 (= l1_s2 l1_s3))) + l1_s4))))) [GOOD] (define-fun s1 () Bool (forall ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8)) (l1_s2 (_ BitVec 8))) - (let ((l1_s3 (U l1_s0 l1_s1))) - (let ((l1_s4 (U l1_s1 l1_s2))) - (let ((l1_s5 (and l1_s3 l1_s4))) - (let ((l1_s6 (tcU l1_s0 l1_s2))) - (let ((l1_s7 (=> l1_s5 l1_s6))) - l1_s7))))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s3 (U l1_s0 l1_s1))) + (let ((l1_s4 (U l1_s1 l1_s2))) + (let ((l1_s5 (and l1_s3 l1_s4))) + (let ((l1_s6 (tcU l1_s0 l1_s2))) + (let ((l1_s7 (=> l1_s5 l1_s6))) + l1_s7))))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/lambda68.gold b/SBVTestSuite/GoldFiles/lambda68.gold index 7b45f291f..7e0454b63 100644 --- a/SBVTestSuite/GoldFiles/lambda68.gold +++ b/SBVTestSuite/GoldFiles/lambda68.gold @@ -13,21 +13,18 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] (declare-fun F (Int) Int) [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 Int)) - (let ((l1_s2 2)) - (let ((l1_s4 3)) - (let ((l1_s1 (F l1_s0))) - (let ((l1_s3 (* l1_s0 l1_s2))) - (let ((l1_s5 (+ l1_s3 l1_s4))) - (let ((l1_s6 (= l1_s1 l1_s5))) - l1_s6)))))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 2)) + (let ((l1_s4 3)) + (let ((l1_s1 (F l1_s0))) + (let ((l1_s3 (* l1_s0 l1_s2))) + (let ((l1_s5 (+ l1_s3 l1_s4))) + (let ((l1_s6 (= l1_s1 l1_s5))) + l1_s6)))))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/lambda69.gold b/SBVTestSuite/GoldFiles/lambda69.gold index 47d855bb5..4af7a06a7 100644 --- a/SBVTestSuite/GoldFiles/lambda69.gold +++ b/SBVTestSuite/GoldFiles/lambda69.gold @@ -13,22 +13,19 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] (declare-fun F (Int Int) Int) [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 Int) (l1_s1 Int)) - (let ((l1_s3 2)) - (let ((l1_s5 3)) - (let ((l1_s2 (F l1_s0 l1_s1))) - (let ((l1_s4 (* l1_s0 l1_s3))) - (let ((l1_s6 (- l1_s5 l1_s1))) - (let ((l1_s7 (+ l1_s4 l1_s6))) - (let ((l1_s8 (= l1_s2 l1_s7))) - l1_s8))))))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s3 2)) + (let ((l1_s5 3)) + (let ((l1_s2 (F l1_s0 l1_s1))) + (let ((l1_s4 (* l1_s0 l1_s3))) + (let ((l1_s6 (- l1_s5 l1_s1))) + (let ((l1_s7 (+ l1_s4 l1_s6))) + (let ((l1_s8 (= l1_s2 l1_s7))) + l1_s8))))))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/lambda70.gold b/SBVTestSuite/GoldFiles/lambda70.gold index 89b23be07..40778d16d 100644 --- a/SBVTestSuite/GoldFiles/lambda70.gold +++ b/SBVTestSuite/GoldFiles/lambda70.gold @@ -13,34 +13,31 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] (declare-fun x_eu1 (Int) Int) [GOOD] (declare-fun x_eu2 (Int) Int) [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 Int)) - (let ((l1_s1 0)) - (let ((l1_s3 1)) - (let ((l1_s2 (= l1_s0 l1_s1))) - (let ((l1_s4 (= l1_s0 l1_s3))) - (let ((l1_s5 (or l1_s2 l1_s4))) - (let ((l1_s6 (x_eu1 l1_s0))) - (let ((l1_s7 (= l1_s1 l1_s6))) - (let ((l1_s8 (= l1_s3 l1_s6))) - (let ((l1_s9 (or l1_s7 l1_s8))) - (let ((l1_s10 (x_eu2 l1_s0))) - (let ((l1_s11 (= l1_s1 l1_s10))) - (let ((l1_s12 (= l1_s3 l1_s10))) - (let ((l1_s13 (or l1_s11 l1_s12))) - (let ((l1_s14 (and l1_s9 l1_s13))) - (let ((l1_s15 (= l1_s6 l1_s10))) - (let ((l1_s16 (=> l1_s14 l1_s15))) - (let ((l1_s17 (and l1_s5 l1_s16))) - (let ((l1_s18 (not l1_s17))) - l1_s18)))))))))))))))))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s1 0)) + (let ((l1_s3 1)) + (let ((l1_s2 (= l1_s0 l1_s1))) + (let ((l1_s4 (= l1_s0 l1_s3))) + (let ((l1_s5 (or l1_s2 l1_s4))) + (let ((l1_s6 (x_eu1 l1_s0))) + (let ((l1_s7 (= l1_s1 l1_s6))) + (let ((l1_s8 (= l1_s3 l1_s6))) + (let ((l1_s9 (or l1_s7 l1_s8))) + (let ((l1_s10 (x_eu2 l1_s0))) + (let ((l1_s11 (= l1_s1 l1_s10))) + (let ((l1_s12 (= l1_s3 l1_s10))) + (let ((l1_s13 (or l1_s11 l1_s12))) + (let ((l1_s14 (and l1_s9 l1_s13))) + (let ((l1_s15 (= l1_s6 l1_s10))) + (let ((l1_s16 (=> l1_s14 l1_s15))) + (let ((l1_s17 (and l1_s5 l1_s16))) + (let ((l1_s18 (not l1_s17))) + l1_s18)))))))))))))))))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/lambda71.gold b/SBVTestSuite/GoldFiles/lambda71.gold index 04dfb51bb..1307df2d0 100644 --- a/SBVTestSuite/GoldFiles/lambda71.gold +++ b/SBVTestSuite/GoldFiles/lambda71.gold @@ -1,13 +1,13 @@ ; Automatically generated by SBV. Do not modify! ; bar :: SInteger -> SInteger [Recursive] (define-fun-rec bar ((l2_s0 Int)) Int - (let ((l2_s1 1)) - (let ((l2_s2 (- l2_s0 l2_s1))) - (let ((l2_s3 (bar l2_s2))) - l2_s3)))) + (let ((l2_s1 1)) + (let ((l2_s2 (- l2_s0 l2_s1))) + (let ((l2_s3 (bar l2_s2))) + l2_s3)))) ; foo :: SInteger -> SInteger [Refers to: bar] (define-fun foo ((l1_s0 Int)) Int - (let ((l1_s1 1)) - (let ((l1_s2 (- l1_s0 l1_s1))) - (let ((l1_s3 (bar l1_s2))) - l1_s3)))) \ No newline at end of file + (let ((l1_s1 1)) + (let ((l1_s2 (- l1_s0 l1_s1))) + (let ((l1_s3 (bar l1_s2))) + l1_s3)))) \ No newline at end of file diff --git a/SBVTestSuite/GoldFiles/lambda72.gold b/SBVTestSuite/GoldFiles/lambda72.gold index 2d65188b6..794edf1e1 100644 --- a/SBVTestSuite/GoldFiles/lambda72.gold +++ b/SBVTestSuite/GoldFiles/lambda72.gold @@ -1,7 +1,7 @@ ; Automatically generated by SBV. Do not modify! ; bar :: SInteger -> SInteger [Recursive] (define-fun-rec bar ((l1_s0 Int)) Int - (let ((l1_s1 1)) - (let ((l1_s2 (- l1_s0 l1_s1))) - (let ((l1_s3 (bar l1_s2))) - l1_s3)))) \ No newline at end of file + (let ((l1_s1 1)) + (let ((l1_s2 (- l1_s0 l1_s1))) + (let ((l1_s3 (bar l1_s2))) + l1_s3)))) \ No newline at end of file diff --git a/SBVTestSuite/GoldFiles/lambda73.gold b/SBVTestSuite/GoldFiles/lambda73.gold index 2bb99a2ae..da7b93648 100644 --- a/SBVTestSuite/GoldFiles/lambda73.gold +++ b/SBVTestSuite/GoldFiles/lambda73.gold @@ -1,6 +1,6 @@ ; Automatically generated by SBV. Do not modify! ; baz :: SInteger -> SInteger (define-fun baz ((l1_s0 Int)) Int - (let ((l1_s1 1)) - (let ((l1_s2 (+ l1_s0 l1_s1))) - l1_s2))) \ No newline at end of file + (let ((l1_s1 1)) + (let ((l1_s2 (+ l1_s0 l1_s1))) + l1_s2))) \ No newline at end of file diff --git a/SBVTestSuite/GoldFiles/lambda74.gold b/SBVTestSuite/GoldFiles/lambda74.gold index f29c8aeb0..923a34a1d 100644 --- a/SBVTestSuite/GoldFiles/lambda74.gold +++ b/SBVTestSuite/GoldFiles/lambda74.gold @@ -4,12 +4,12 @@ ((e ((l1_s0 Int)) Int) (o ((l2_s0 Int)) Int)) (; Definition of: e :: SInteger -> SInteger. [Refers to: o] - (let ((l1_s1 1)) - (let ((l1_s2 (- l1_s0 l1_s1))) - (let ((l1_s3 (o l1_s2))) - l1_s3))) + (let ((l1_s1 1)) + (let ((l1_s2 (- l1_s0 l1_s1))) + (let ((l1_s3 (o l1_s2))) + l1_s3))) ; Definition of: o :: SInteger -> SInteger. [Refers to: e] - (let ((l2_s1 1)) - (let ((l2_s2 (- l2_s0 l2_s1))) - (let ((l2_s3 (e l2_s2))) - l2_s3))))) \ No newline at end of file + (let ((l2_s1 1)) + (let ((l2_s2 (- l2_s0 l2_s1))) + (let ((l2_s3 (e l2_s2))) + l2_s3))))) \ No newline at end of file diff --git a/SBVTestSuite/GoldFiles/lambda75.gold b/SBVTestSuite/GoldFiles/lambda75.gold index fb1a216ec..a7e9a7d5c 100644 --- a/SBVTestSuite/GoldFiles/lambda75.gold +++ b/SBVTestSuite/GoldFiles/lambda75.gold @@ -4,12 +4,12 @@ ((e ((l2_s0 Int)) Int) (o ((l1_s0 Int)) Int)) (; Definition of: e :: SInteger -> SInteger. [Refers to: o] - (let ((l2_s1 1)) - (let ((l2_s2 (- l2_s0 l2_s1))) - (let ((l2_s3 (o l2_s2))) - l2_s3))) + (let ((l2_s1 1)) + (let ((l2_s2 (- l2_s0 l2_s1))) + (let ((l2_s3 (o l2_s2))) + l2_s3))) ; Definition of: o :: SInteger -> SInteger. [Refers to: e] - (let ((l1_s1 1)) - (let ((l1_s2 (- l1_s0 l1_s1))) - (let ((l1_s3 (e l1_s2))) - l1_s3))))) \ No newline at end of file + (let ((l1_s1 1)) + (let ((l1_s2 (- l1_s0 l1_s1))) + (let ((l1_s3 (e l1_s2))) + l1_s3))))) \ No newline at end of file diff --git a/SBVTestSuite/GoldFiles/lambda79.gold b/SBVTestSuite/GoldFiles/lambda79.gold index 250d40549..76529caf1 100644 --- a/SBVTestSuite/GoldFiles/lambda79.gold +++ b/SBVTestSuite/GoldFiles/lambda79.gold @@ -1,10 +1,10 @@ ; Automatically generated by SBV. Do not modify! ; foo :: SInteger -> SWord32 (define-fun foo ((l1_s0 Int)) (_ BitVec 32) - (let ((l1_s1 #x00000001)) - (let ((l1_s2 #x00000002)) - (let ((l1_s3 #x00000003)) - (let ((l1_s4 #x00000000)) - (let ((table0 (lambda ((idx Int)) (ite (= idx 0) l1_s1 (ite (= idx 1) l1_s2 l1_s3))))) - (let ((l1_s5 (ite (or (< l1_s0 0) (<= 3 l1_s0)) l1_s4 (table0 l1_s0)))) - l1_s5))))))) \ No newline at end of file + (let ((l1_s1 #x00000001)) + (let ((l1_s2 #x00000002)) + (let ((l1_s3 #x00000003)) + (let ((l1_s4 #x00000000)) + (let ((table0 (lambda ((idx Int)) (ite (= idx 0) l1_s1 (ite (= idx 1) l1_s2 l1_s3))))) + (let ((l1_s5 (ite (or (< l1_s0 0) (<= 3 l1_s0)) l1_s4 (table0 l1_s0)))) + l1_s5))))))) \ No newline at end of file diff --git a/SBVTestSuite/GoldFiles/lambda80.gold b/SBVTestSuite/GoldFiles/lambda80.gold index 9ff7ddf07..4e1c5742f 100644 --- a/SBVTestSuite/GoldFiles/lambda80.gold +++ b/SBVTestSuite/GoldFiles/lambda80.gold @@ -1,13 +1,13 @@ ; Automatically generated by SBV. Do not modify! ; foo :: SInteger -> SInteger (define-fun foo ((l1_s0 Int)) Int - (let ((l1_s1 1)) - (let ((l1_s3 2)) - (let ((l1_s5 3)) - (let ((l1_s7 0)) - (let ((l1_s2 (+ l1_s0 l1_s1))) - (let ((l1_s4 (+ l1_s0 l1_s3))) - (let ((l1_s6 (+ l1_s0 l1_s5))) - (let ((table0 (lambda ((idx Int)) (ite (= idx 0) l1_s2 (ite (= idx 1) l1_s4 l1_s6))))) - (let ((l1_s8 (ite (or (< l1_s0 0) (<= 3 l1_s0)) l1_s7 (table0 l1_s0)))) - l1_s8)))))))))) \ No newline at end of file + (let ((l1_s1 1)) + (let ((l1_s3 2)) + (let ((l1_s5 3)) + (let ((l1_s7 0)) + (let ((l1_s2 (+ l1_s0 l1_s1))) + (let ((l1_s4 (+ l1_s0 l1_s3))) + (let ((l1_s6 (+ l1_s0 l1_s5))) + (let ((table0 (lambda ((idx Int)) (ite (= idx 0) l1_s2 (ite (= idx 1) l1_s4 l1_s6))))) + (let ((l1_s8 (ite (or (< l1_s0 0) (<= 3 l1_s0)) l1_s7 (table0 l1_s0)))) + l1_s8)))))))))) \ No newline at end of file diff --git a/SBVTestSuite/GoldFiles/mapNoFailure.gold b/SBVTestSuite/GoldFiles/mapNoFailure.gold index f1d3f349f..023b3f63a 100644 --- a/SBVTestSuite/GoldFiles/mapNoFailure.gold +++ b/SBVTestSuite/GoldFiles/mapNoFailure.gold @@ -23,7 +23,6 @@ [GOOD] (declare-fun s2 () Int) ; tracks user variable "c" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -147,8 +146,6 @@ [GOOD] (define-fun s124 () Bool (or s119 s123)) [GOOD] (define-fun s125 () Bool (not s19)) [GOOD] (define-fun s126 () Bool (and s124 s125)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s6) diff --git a/SBVTestSuite/GoldFiles/mapWithFailure.gold b/SBVTestSuite/GoldFiles/mapWithFailure.gold index a79d7d5c6..8274d9afd 100644 --- a/SBVTestSuite/GoldFiles/mapWithFailure.gold +++ b/SBVTestSuite/GoldFiles/mapWithFailure.gold @@ -23,7 +23,6 @@ [GOOD] (declare-fun s0 () (Seq Int)) ; tracks user variable "ints" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -176,8 +175,6 @@ [GOOD] (define-fun s153 () Bool (not s3)) [GOOD] (define-fun s154 () Bool (and s152 s153)) [GOOD] (define-fun s155 () Bool (=> s94 s154)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s155) diff --git a/SBVTestSuite/GoldFiles/maxlWithFailure.gold b/SBVTestSuite/GoldFiles/maxlWithFailure.gold index e004b3e14..e84bb621d 100644 --- a/SBVTestSuite/GoldFiles/maxlWithFailure.gold +++ b/SBVTestSuite/GoldFiles/maxlWithFailure.gold @@ -20,7 +20,6 @@ [GOOD] (declare-fun s0 () (Seq Int)) ; tracks user variable "ints" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -154,8 +153,6 @@ [GOOD] (define-fun s131 () Bool (not s3)) [GOOD] (define-fun s132 () Bool (and s130 s131)) [GOOD] (define-fun s133 () Bool (=> s82 s132)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s133) diff --git a/SBVTestSuite/GoldFiles/maxrWithFailure.gold b/SBVTestSuite/GoldFiles/maxrWithFailure.gold index 04872b64f..f7399a2a9 100644 --- a/SBVTestSuite/GoldFiles/maxrWithFailure.gold +++ b/SBVTestSuite/GoldFiles/maxrWithFailure.gold @@ -20,7 +20,6 @@ [GOOD] (declare-fun s0 () (Seq Int)) ; tracks user variable "ints" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -163,8 +162,6 @@ [GOOD] (define-fun s140 () Bool (not s3)) [GOOD] (define-fun s141 () Bool (and s139 s140)) [GOOD] (define-fun s142 () Bool (=> s82 s141)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s142) diff --git a/SBVTestSuite/GoldFiles/pbAtLeast.gold b/SBVTestSuite/GoldFiles/pbAtLeast.gold index 1f43cf461..f9c111cd4 100644 --- a/SBVTestSuite/GoldFiles/pbAtLeast.gold +++ b/SBVTestSuite/GoldFiles/pbAtLeast.gold @@ -26,7 +26,6 @@ [GOOD] (declare-fun s9 () Bool) ; tracks user variable "b9" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -53,8 +52,6 @@ [GOOD] (define-fun s33 () Bool (bvuge s31 s32)) [GOOD] (define-fun s34 () Bool (= s10 s33)) [GOOD] (define-fun s35 () Bool (not s34)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s35) diff --git a/SBVTestSuite/GoldFiles/pbAtMost.gold b/SBVTestSuite/GoldFiles/pbAtMost.gold index de8214baa..884048283 100644 --- a/SBVTestSuite/GoldFiles/pbAtMost.gold +++ b/SBVTestSuite/GoldFiles/pbAtMost.gold @@ -26,7 +26,6 @@ [GOOD] (declare-fun s9 () Bool) ; tracks user variable "b9" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -53,8 +52,6 @@ [GOOD] (define-fun s33 () Bool (bvule s31 s32)) [GOOD] (define-fun s34 () Bool (= s10 s33)) [GOOD] (define-fun s35 () Bool (not s34)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s35) diff --git a/SBVTestSuite/GoldFiles/pbEq.gold b/SBVTestSuite/GoldFiles/pbEq.gold index 761bcc747..f04746813 100644 --- a/SBVTestSuite/GoldFiles/pbEq.gold +++ b/SBVTestSuite/GoldFiles/pbEq.gold @@ -34,7 +34,6 @@ [GOOD] (declare-fun s9 () Bool) ; tracks user variable "b9" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -61,8 +60,6 @@ [GOOD] (define-fun s41 () Bool (= s29 s40)) [GOOD] (define-fun s42 () Bool (= s10 s41)) [GOOD] (define-fun s43 () Bool (not s42)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s43) diff --git a/SBVTestSuite/GoldFiles/pbEq2.gold b/SBVTestSuite/GoldFiles/pbEq2.gold index 34b315334..a16d344da 100644 --- a/SBVTestSuite/GoldFiles/pbEq2.gold +++ b/SBVTestSuite/GoldFiles/pbEq2.gold @@ -23,7 +23,6 @@ [GOOD] (declare-fun s9 () Bool) ; tracks user variable "b9" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -34,14 +33,14 @@ [GOOD] (define-fun s14 () Bool ((_ pbeq 1 1 1 1) s0 s3 s4)) [GOOD] (define-fun s15 () Bool (ite s2 s13 s14)) [GOOD] (define-fun s16 () Bool (and s12 s15)) -[GOOD] (define-fun s17 () Bool (= false s0)) -[GOOD] (define-fun s18 () Bool (= false s2)) -[GOOD] (define-fun s19 () Bool (= false s4)) +[GOOD] (define-fun s17 () Bool (not s0)) +[GOOD] (define-fun s18 () Bool (not s2)) +[GOOD] (define-fun s19 () Bool (not s4)) [GOOD] (define-fun s20 () Bool (and s3 s19)) [GOOD] (define-fun s21 () Bool (and s18 s20)) [GOOD] (define-fun s22 () Bool (and s1 s21)) [GOOD] (define-fun s23 () Bool (and s17 s22)) -[GOOD] (define-fun s24 () Bool (= false s3)) +[GOOD] (define-fun s24 () Bool (not s3)) [GOOD] (define-fun s25 () Bool (and s4 s24)) [GOOD] (define-fun s26 () Bool (and s18 s25)) [GOOD] (define-fun s27 () Bool (and s1 s26)) @@ -49,8 +48,6 @@ [GOOD] (define-fun s29 () Bool (or s23 s28)) [GOOD] (define-fun s30 () Bool (=> s16 s29)) [GOOD] (define-fun s31 () Bool (not s30)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s31) diff --git a/SBVTestSuite/GoldFiles/pbExactly.gold b/SBVTestSuite/GoldFiles/pbExactly.gold index bf3bb325c..8a22bd34d 100644 --- a/SBVTestSuite/GoldFiles/pbExactly.gold +++ b/SBVTestSuite/GoldFiles/pbExactly.gold @@ -26,7 +26,6 @@ [GOOD] (declare-fun s9 () Bool) ; tracks user variable "b9" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -53,8 +52,6 @@ [GOOD] (define-fun s33 () Bool (= s31 s32)) [GOOD] (define-fun s34 () Bool (= s10 s33)) [GOOD] (define-fun s35 () Bool (not s34)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s35) diff --git a/SBVTestSuite/GoldFiles/pbGe.gold b/SBVTestSuite/GoldFiles/pbGe.gold index 9139158a0..01d021e9d 100644 --- a/SBVTestSuite/GoldFiles/pbGe.gold +++ b/SBVTestSuite/GoldFiles/pbGe.gold @@ -34,7 +34,6 @@ [GOOD] (declare-fun s9 () Bool) ; tracks user variable "b9" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -61,8 +60,6 @@ [GOOD] (define-fun s41 () Bool (>= s40 s29)) [GOOD] (define-fun s42 () Bool (= s10 s41)) [GOOD] (define-fun s43 () Bool (not s42)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s43) diff --git a/SBVTestSuite/GoldFiles/pbLe.gold b/SBVTestSuite/GoldFiles/pbLe.gold index 2572281fc..977dba947 100644 --- a/SBVTestSuite/GoldFiles/pbLe.gold +++ b/SBVTestSuite/GoldFiles/pbLe.gold @@ -34,7 +34,6 @@ [GOOD] (declare-fun s9 () Bool) ; tracks user variable "b9" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -61,8 +60,6 @@ [GOOD] (define-fun s41 () Bool (<= s40 s29)) [GOOD] (define-fun s42 () Bool (= s10 s41)) [GOOD] (define-fun s43 () Bool (not s42)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s43) diff --git a/SBVTestSuite/GoldFiles/pbMutexed.gold b/SBVTestSuite/GoldFiles/pbMutexed.gold index 68cc6025a..bc672df56 100644 --- a/SBVTestSuite/GoldFiles/pbMutexed.gold +++ b/SBVTestSuite/GoldFiles/pbMutexed.gold @@ -25,7 +25,6 @@ [GOOD] (declare-fun s9 () Bool) ; tracks user variable "b9" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -52,8 +51,6 @@ [GOOD] (define-fun s32 () Bool (bvule s31 s11)) [GOOD] (define-fun s33 () Bool (= s10 s32)) [GOOD] (define-fun s34 () Bool (not s33)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s34) diff --git a/SBVTestSuite/GoldFiles/pbStronglyMutexed.gold b/SBVTestSuite/GoldFiles/pbStronglyMutexed.gold index 81a9b6411..568c32878 100644 --- a/SBVTestSuite/GoldFiles/pbStronglyMutexed.gold +++ b/SBVTestSuite/GoldFiles/pbStronglyMutexed.gold @@ -25,7 +25,6 @@ [GOOD] (declare-fun s9 () Bool) ; tracks user variable "b9" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -52,8 +51,6 @@ [GOOD] (define-fun s32 () Bool (= s11 s31)) [GOOD] (define-fun s33 () Bool (= s10 s32)) [GOOD] (define-fun s34 () Bool (not s33)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s34) diff --git a/SBVTestSuite/GoldFiles/qUninterp1.gold b/SBVTestSuite/GoldFiles/qUninterp1.gold index 0268cdd47..49cf31fb6 100644 --- a/SBVTestSuite/GoldFiles/qUninterp1.gold +++ b/SBVTestSuite/GoldFiles/qUninterp1.gold @@ -18,12 +18,9 @@ [GOOD] (declare-fun s0 () L) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [SEND] (check-sat) diff --git a/SBVTestSuite/GoldFiles/quantifiedB_0.gold b/SBVTestSuite/GoldFiles/quantifiedB_0.gold index c134ef0e2..23118dccd 100644 --- a/SBVTestSuite/GoldFiles/quantifiedB_0.gold +++ b/SBVTestSuite/GoldFiles/quantifiedB_0.gold @@ -13,30 +13,27 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8)) (l1_s2 (_ BitVec 8)) (l1_s3 (_ BitVec 8))) - (let ((l1_s4 #x14)) - (let ((l1_s12 #x01)) - (let ((l1_s17 #x00)) - (let ((l1_s5 (bvult l1_s0 l1_s4))) - (let ((l1_s6 (bvult l1_s1 l1_s4))) - (let ((l1_s7 (bvult l1_s2 l1_s4))) - (let ((l1_s8 (bvult l1_s3 l1_s4))) - (let ((l1_s9 (and l1_s7 l1_s8))) - (let ((l1_s10 (and l1_s6 l1_s9))) - (let ((l1_s11 (and l1_s5 l1_s10))) - (let ((l1_s13 (bvadd l1_s0 l1_s12))) - (let ((l1_s14 (bvadd l1_s1 l1_s13))) - (let ((l1_s15 (bvadd l1_s2 l1_s14))) - (let ((l1_s16 (bvadd l1_s3 l1_s15))) - (let ((l1_s18 (= l1_s16 l1_s17))) - (let ((l1_s19 (and l1_s11 l1_s18))) - l1_s19)))))))))))))))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s4 #x14)) + (let ((l1_s12 #x01)) + (let ((l1_s17 #x00)) + (let ((l1_s5 (bvult l1_s0 l1_s4))) + (let ((l1_s6 (bvult l1_s1 l1_s4))) + (let ((l1_s7 (bvult l1_s2 l1_s4))) + (let ((l1_s8 (bvult l1_s3 l1_s4))) + (let ((l1_s9 (and l1_s7 l1_s8))) + (let ((l1_s10 (and l1_s6 l1_s9))) + (let ((l1_s11 (and l1_s5 l1_s10))) + (let ((l1_s13 (bvadd l1_s0 l1_s12))) + (let ((l1_s14 (bvadd l1_s1 l1_s13))) + (let ((l1_s15 (bvadd l1_s2 l1_s14))) + (let ((l1_s16 (bvadd l1_s3 l1_s15))) + (let ((l1_s18 (= l1_s16 l1_s17))) + (let ((l1_s19 (and l1_s11 l1_s18))) + l1_s19)))))))))))))))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantifiedB_1.gold b/SBVTestSuite/GoldFiles/quantifiedB_1.gold index fdf36038c..5b9efa41c 100644 --- a/SBVTestSuite/GoldFiles/quantifiedB_1.gold +++ b/SBVTestSuite/GoldFiles/quantifiedB_1.gold @@ -13,19 +13,16 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8)) (l1_s2 (_ BitVec 8)) (l1_s3 (_ BitVec 8))) - (let ((l1_s7 #x00)) - (let ((l1_s4 (bvadd l1_s0 l1_s1))) - (let ((l1_s5 (bvadd l1_s2 l1_s4))) - (let ((l1_s6 (bvadd l1_s3 l1_s5))) - (let ((l1_s8 (= l1_s6 l1_s7))) - l1_s8))))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s7 #x00)) + (let ((l1_s4 (bvadd l1_s0 l1_s1))) + (let ((l1_s5 (bvadd l1_s2 l1_s4))) + (let ((l1_s6 (bvadd l1_s3 l1_s5))) + (let ((l1_s8 (= l1_s6 l1_s7))) + l1_s8))))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantifiedB_2.gold b/SBVTestSuite/GoldFiles/quantifiedB_2.gold index ace2b2ffd..74947ca43 100644 --- a/SBVTestSuite/GoldFiles/quantifiedB_2.gold +++ b/SBVTestSuite/GoldFiles/quantifiedB_2.gold @@ -14,18 +14,15 @@ [GOOD] (declare-fun s0 () (_ BitVec 8)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s1 () Bool (forall ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8)) (l1_s2 (_ BitVec 8)) (l1_s3 (_ BitVec 8))) - (let ((l1_s4 (bvadd l1_s0 l1_s1))) - (let ((l1_s5 (bvadd l1_s2 l1_s4))) - (let ((l1_s6 (bvadd l1_s3 l1_s5))) - (let ((l1_s7 (= s0 l1_s6))) - l1_s7)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s4 (bvadd l1_s0 l1_s1))) + (let ((l1_s5 (bvadd l1_s2 l1_s4))) + (let ((l1_s6 (bvadd l1_s3 l1_s5))) + (let ((l1_s7 (= s0 l1_s6))) + l1_s7)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s1) diff --git a/SBVTestSuite/GoldFiles/quantifiedB_3.gold b/SBVTestSuite/GoldFiles/quantifiedB_3.gold index 96b5b0b1d..d7bb1a94f 100644 --- a/SBVTestSuite/GoldFiles/quantifiedB_3.gold +++ b/SBVTestSuite/GoldFiles/quantifiedB_3.gold @@ -14,18 +14,15 @@ [GOOD] (declare-fun s0 () (_ BitVec 8)) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s1 () Bool (exists ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8)) (l1_s2 (_ BitVec 8)) (l1_s3 (_ BitVec 8))) - (let ((l1_s4 (bvadd l1_s0 l1_s1))) - (let ((l1_s5 (bvadd l1_s2 l1_s4))) - (let ((l1_s6 (bvadd l1_s3 l1_s5))) - (let ((l1_s7 (= s0 l1_s6))) - l1_s7)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s4 (bvadd l1_s0 l1_s1))) + (let ((l1_s5 (bvadd l1_s2 l1_s4))) + (let ((l1_s6 (bvadd l1_s3 l1_s5))) + (let ((l1_s7 (= s0 l1_s6))) + l1_s7)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s1) diff --git a/SBVTestSuite/GoldFiles/quantifiedB_4.gold b/SBVTestSuite/GoldFiles/quantifiedB_4.gold index 3be8c5387..d52dfee8e 100644 --- a/SBVTestSuite/GoldFiles/quantifiedB_4.gold +++ b/SBVTestSuite/GoldFiles/quantifiedB_4.gold @@ -13,18 +13,15 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8)) (l1_s2 (_ BitVec 8)) (l1_s3 (_ BitVec 8)) (l1_s4 (_ BitVec 8))) - (let ((l1_s5 (bvadd l1_s0 l1_s1))) - (let ((l1_s6 (bvadd l1_s2 l1_s5))) - (let ((l1_s7 (bvadd l1_s3 l1_s6))) - (let ((l1_s8 (= l1_s4 l1_s7))) - l1_s8)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s5 (bvadd l1_s0 l1_s1))) + (let ((l1_s6 (bvadd l1_s2 l1_s5))) + (let ((l1_s7 (bvadd l1_s3 l1_s6))) + (let ((l1_s8 (= l1_s4 l1_s7))) + l1_s8)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantifiedB_5.gold b/SBVTestSuite/GoldFiles/quantifiedB_5.gold index d66d8b700..d34c09db1 100644 --- a/SBVTestSuite/GoldFiles/quantifiedB_5.gold +++ b/SBVTestSuite/GoldFiles/quantifiedB_5.gold @@ -13,18 +13,15 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8)) (l1_s2 (_ BitVec 8)) (l1_s3 (_ BitVec 8))) (forall ((l1_s4 (_ BitVec 8))) - (let ((l1_s5 (bvadd l1_s0 l1_s1))) - (let ((l1_s6 (bvadd l1_s2 l1_s5))) - (let ((l1_s7 (bvadd l1_s3 l1_s6))) - (let ((l1_s8 (= l1_s4 l1_s7))) - l1_s8))))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s5 (bvadd l1_s0 l1_s1))) + (let ((l1_s6 (bvadd l1_s2 l1_s5))) + (let ((l1_s7 (bvadd l1_s3 l1_s6))) + (let ((l1_s8 (= l1_s4 l1_s7))) + l1_s8))))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantifiedB_6.gold b/SBVTestSuite/GoldFiles/quantifiedB_6.gold index e8c8171f9..3cfbddfe7 100644 --- a/SBVTestSuite/GoldFiles/quantifiedB_6.gold +++ b/SBVTestSuite/GoldFiles/quantifiedB_6.gold @@ -13,14 +13,11 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 Bool)) - l1_s0)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + l1_s0)) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantifiedB_7.gold b/SBVTestSuite/GoldFiles/quantifiedB_7.gold index 8eb84fe06..942dd3310 100644 --- a/SBVTestSuite/GoldFiles/quantifiedB_7.gold +++ b/SBVTestSuite/GoldFiles/quantifiedB_7.gold @@ -13,15 +13,13 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 Bool)) - (exists ((l2_s0 Bool)) + (let ((l1_s1 (exists ((l2_s0 Bool)) (or l1_s0 l2_s0)))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + l1_s1))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantifiedB_8.gold b/SBVTestSuite/GoldFiles/quantifiedB_8.gold index 8eb84fe06..942dd3310 100644 --- a/SBVTestSuite/GoldFiles/quantifiedB_8.gold +++ b/SBVTestSuite/GoldFiles/quantifiedB_8.gold @@ -13,15 +13,13 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 Bool)) - (exists ((l2_s0 Bool)) + (let ((l1_s1 (exists ((l2_s0 Bool)) (or l1_s0 l2_s0)))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + l1_s1))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantifiedB_9.gold b/SBVTestSuite/GoldFiles/quantifiedB_9.gold index 8eb84fe06..942dd3310 100644 --- a/SBVTestSuite/GoldFiles/quantifiedB_9.gold +++ b/SBVTestSuite/GoldFiles/quantifiedB_9.gold @@ -13,15 +13,13 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 Bool)) - (exists ((l2_s0 Bool)) + (let ((l1_s1 (exists ((l2_s0 Bool)) (or l1_s0 l2_s0)))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + l1_s1))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantifiedB_A.gold b/SBVTestSuite/GoldFiles/quantifiedB_A.gold index 92379f4e4..d741feaff 100644 --- a/SBVTestSuite/GoldFiles/quantifiedB_A.gold +++ b/SBVTestSuite/GoldFiles/quantifiedB_A.gold @@ -13,19 +13,16 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 Int)) (forall ((l1_s1 Int)) (exists ((l1_s2 Int)) (forall ((l1_s3 Int)) - (let ((l1_s7 0)) - (let ((l1_s4 (+ l1_s0 l1_s1))) - (let ((l1_s5 (+ l1_s2 l1_s4))) - (let ((l1_s6 (+ l1_s3 l1_s5))) - (let ((l1_s8 (= l1_s6 l1_s7))) - l1_s8)))))))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s7 0)) + (let ((l1_s4 (+ l1_s0 l1_s1))) + (let ((l1_s5 (+ l1_s2 l1_s4))) + (let ((l1_s6 (+ l1_s3 l1_s5))) + (let ((l1_s8 (= l1_s6 l1_s7))) + l1_s8)))))))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantifiedB_B.gold b/SBVTestSuite/GoldFiles/quantifiedB_B.gold index bba88b8a2..bb36def19 100644 --- a/SBVTestSuite/GoldFiles/quantifiedB_B.gold +++ b/SBVTestSuite/GoldFiles/quantifiedB_B.gold @@ -13,19 +13,16 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 Int)) (exists ((l1_s1 Int)) (forall ((l1_s2 Int)) (exists ((l1_s3 Int)) - (let ((l1_s7 0)) - (let ((l1_s4 (+ l1_s0 l1_s1))) - (let ((l1_s5 (+ l1_s2 l1_s4))) - (let ((l1_s6 (+ l1_s3 l1_s5))) - (let ((l1_s8 (= l1_s6 l1_s7))) - l1_s8)))))))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s7 0)) + (let ((l1_s4 (+ l1_s0 l1_s1))) + (let ((l1_s5 (+ l1_s2 l1_s4))) + (let ((l1_s6 (+ l1_s3 l1_s5))) + (let ((l1_s8 (= l1_s6 l1_s7))) + l1_s8)))))))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_prove_existsexists_contradiction_p.gold b/SBVTestSuite/GoldFiles/quantified_prove_existsexists_contradiction_p.gold index 42d841b6e..d078314ea 100644 --- a/SBVTestSuite/GoldFiles/quantified_prove_existsexists_contradiction_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_prove_existsexists_contradiction_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 (= l1_s0 l1_s1))) - (let ((l1_s3 (distinct l1_s0 l1_s1))) - (let ((l1_s4 (and l1_s2 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (= l1_s0 l1_s1))) + (let ((l1_s3 (distinct l1_s0 l1_s1))) + (let ((l1_s4 (and l1_s2 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (not s0)) diff --git a/SBVTestSuite/GoldFiles/quantified_prove_existsexists_satisfiable_p.gold b/SBVTestSuite/GoldFiles/quantified_prove_existsexists_satisfiable_p.gold index 67303d634..66b20d4ff 100644 --- a/SBVTestSuite/GoldFiles/quantified_prove_existsexists_satisfiable_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_prove_existsexists_satisfiable_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 #x01)) - (let ((l1_s3 (bvadd l1_s1 l1_s2))) - (let ((l1_s4 (= l1_s0 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 #x01)) + (let ((l1_s3 (bvadd l1_s1 l1_s2))) + (let ((l1_s4 (= l1_s0 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (not s0)) diff --git a/SBVTestSuite/GoldFiles/quantified_prove_existsexists_thm_p.gold b/SBVTestSuite/GoldFiles/quantified_prove_existsexists_thm_p.gold index 389d8d189..b7d72e4b0 100644 --- a/SBVTestSuite/GoldFiles/quantified_prove_existsexists_thm_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_prove_existsexists_thm_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 (bvsub l1_s1 l1_s0))) - (let ((l1_s3 (bvadd l1_s0 l1_s2))) - (let ((l1_s4 (= l1_s1 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (bvsub l1_s1 l1_s0))) + (let ((l1_s3 (bvadd l1_s0 l1_s2))) + (let ((l1_s4 (= l1_s1 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (not s0)) diff --git a/SBVTestSuite/GoldFiles/quantified_prove_existsforall_contradiction_p.gold b/SBVTestSuite/GoldFiles/quantified_prove_existsforall_contradiction_p.gold index 6879dd03b..6c2235959 100644 --- a/SBVTestSuite/GoldFiles/quantified_prove_existsforall_contradiction_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_prove_existsforall_contradiction_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8))) (forall ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 (= l1_s0 l1_s1))) - (let ((l1_s3 (distinct l1_s0 l1_s1))) - (let ((l1_s4 (and l1_s2 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (= l1_s0 l1_s1))) + (let ((l1_s3 (distinct l1_s0 l1_s1))) + (let ((l1_s4 (and l1_s2 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (not s0)) diff --git a/SBVTestSuite/GoldFiles/quantified_prove_existsforall_satisfiable_p.gold b/SBVTestSuite/GoldFiles/quantified_prove_existsforall_satisfiable_p.gold index fc53220d7..330ab04ea 100644 --- a/SBVTestSuite/GoldFiles/quantified_prove_existsforall_satisfiable_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_prove_existsforall_satisfiable_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8))) (forall ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 #x01)) - (let ((l1_s3 (bvadd l1_s1 l1_s2))) - (let ((l1_s4 (= l1_s0 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 #x01)) + (let ((l1_s3 (bvadd l1_s1 l1_s2))) + (let ((l1_s4 (= l1_s0 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (not s0)) diff --git a/SBVTestSuite/GoldFiles/quantified_prove_existsforall_thm_p.gold b/SBVTestSuite/GoldFiles/quantified_prove_existsforall_thm_p.gold index 42ae33cf8..9505b63c2 100644 --- a/SBVTestSuite/GoldFiles/quantified_prove_existsforall_thm_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_prove_existsforall_thm_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8))) (forall ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 (bvsub l1_s1 l1_s0))) - (let ((l1_s3 (bvadd l1_s0 l1_s2))) - (let ((l1_s4 (= l1_s1 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (bvsub l1_s1 l1_s0))) + (let ((l1_s3 (bvadd l1_s0 l1_s2))) + (let ((l1_s4 (= l1_s1 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (not s0)) diff --git a/SBVTestSuite/GoldFiles/quantified_prove_forallexists_contradiction_p.gold b/SBVTestSuite/GoldFiles/quantified_prove_forallexists_contradiction_p.gold index f5cc27edc..19abd3f39 100644 --- a/SBVTestSuite/GoldFiles/quantified_prove_forallexists_contradiction_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_prove_forallexists_contradiction_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8))) (exists ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 (= l1_s0 l1_s1))) - (let ((l1_s3 (distinct l1_s0 l1_s1))) - (let ((l1_s4 (and l1_s2 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (= l1_s0 l1_s1))) + (let ((l1_s3 (distinct l1_s0 l1_s1))) + (let ((l1_s4 (and l1_s2 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (not s0)) diff --git a/SBVTestSuite/GoldFiles/quantified_prove_forallexists_satisfiable_p.gold b/SBVTestSuite/GoldFiles/quantified_prove_forallexists_satisfiable_p.gold index cbb3a0e19..fe2c44546 100644 --- a/SBVTestSuite/GoldFiles/quantified_prove_forallexists_satisfiable_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_prove_forallexists_satisfiable_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8))) (exists ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 #x01)) - (let ((l1_s3 (bvadd l1_s1 l1_s2))) - (let ((l1_s4 (= l1_s0 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 #x01)) + (let ((l1_s3 (bvadd l1_s1 l1_s2))) + (let ((l1_s4 (= l1_s0 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (not s0)) diff --git a/SBVTestSuite/GoldFiles/quantified_prove_forallexists_thm_p.gold b/SBVTestSuite/GoldFiles/quantified_prove_forallexists_thm_p.gold index 8494b1a6e..07a14bb0c 100644 --- a/SBVTestSuite/GoldFiles/quantified_prove_forallexists_thm_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_prove_forallexists_thm_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8))) (exists ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 (bvsub l1_s1 l1_s0))) - (let ((l1_s3 (bvadd l1_s0 l1_s2))) - (let ((l1_s4 (= l1_s1 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (bvsub l1_s1 l1_s0))) + (let ((l1_s3 (bvadd l1_s0 l1_s2))) + (let ((l1_s4 (= l1_s1 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (not s0)) diff --git a/SBVTestSuite/GoldFiles/quantified_prove_forallforall_contradiction_p.gold b/SBVTestSuite/GoldFiles/quantified_prove_forallforall_contradiction_p.gold index 0467359da..23236b337 100644 --- a/SBVTestSuite/GoldFiles/quantified_prove_forallforall_contradiction_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_prove_forallforall_contradiction_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 (= l1_s0 l1_s1))) - (let ((l1_s3 (distinct l1_s0 l1_s1))) - (let ((l1_s4 (and l1_s2 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (= l1_s0 l1_s1))) + (let ((l1_s3 (distinct l1_s0 l1_s1))) + (let ((l1_s4 (and l1_s2 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (not s0)) diff --git a/SBVTestSuite/GoldFiles/quantified_prove_forallforall_satisfiable_p.gold b/SBVTestSuite/GoldFiles/quantified_prove_forallforall_satisfiable_p.gold index 3974d49a9..bab5521b3 100644 --- a/SBVTestSuite/GoldFiles/quantified_prove_forallforall_satisfiable_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_prove_forallforall_satisfiable_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 #x01)) - (let ((l1_s3 (bvadd l1_s1 l1_s2))) - (let ((l1_s4 (= l1_s0 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 #x01)) + (let ((l1_s3 (bvadd l1_s1 l1_s2))) + (let ((l1_s4 (= l1_s0 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (not s0)) diff --git a/SBVTestSuite/GoldFiles/quantified_prove_forallforall_thm_p.gold b/SBVTestSuite/GoldFiles/quantified_prove_forallforall_thm_p.gold index fb12d0173..60810c6f6 100644 --- a/SBVTestSuite/GoldFiles/quantified_prove_forallforall_thm_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_prove_forallforall_thm_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 (bvsub l1_s1 l1_s0))) - (let ((l1_s3 (bvadd l1_s0 l1_s2))) - (let ((l1_s4 (= l1_s1 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (bvsub l1_s1 l1_s0))) + (let ((l1_s3 (bvadd l1_s0 l1_s2))) + (let ((l1_s4 (= l1_s1 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (not s0)) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_existsexists_contradiction_c.gold b/SBVTestSuite/GoldFiles/quantified_sat_existsexists_contradiction_c.gold index d8a1c8c2f..746e320df 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_existsexists_contradiction_c.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_existsexists_contradiction_c.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 (= l1_s0 l1_s1))) - (let ((l1_s3 (distinct l1_s0 l1_s1))) - (let ((l1_s4 (and l1_s2 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (= l1_s0 l1_s1))) + (let ((l1_s3 (distinct l1_s0 l1_s1))) + (let ((l1_s4 (and l1_s2 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_existsexists_contradiction_p.gold b/SBVTestSuite/GoldFiles/quantified_sat_existsexists_contradiction_p.gold index d8a1c8c2f..746e320df 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_existsexists_contradiction_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_existsexists_contradiction_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 (= l1_s0 l1_s1))) - (let ((l1_s3 (distinct l1_s0 l1_s1))) - (let ((l1_s4 (and l1_s2 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (= l1_s0 l1_s1))) + (let ((l1_s3 (distinct l1_s0 l1_s1))) + (let ((l1_s4 (and l1_s2 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_existsexists_satisfiable_c.gold b/SBVTestSuite/GoldFiles/quantified_sat_existsexists_satisfiable_c.gold index 81b50e408..2e067f2f0 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_existsexists_satisfiable_c.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_existsexists_satisfiable_c.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 #x01)) - (let ((l1_s3 (bvadd l1_s1 l1_s2))) - (let ((l1_s4 (= l1_s0 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 #x01)) + (let ((l1_s3 (bvadd l1_s1 l1_s2))) + (let ((l1_s4 (= l1_s0 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_existsexists_satisfiable_p.gold b/SBVTestSuite/GoldFiles/quantified_sat_existsexists_satisfiable_p.gold index 81b50e408..2e067f2f0 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_existsexists_satisfiable_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_existsexists_satisfiable_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 #x01)) - (let ((l1_s3 (bvadd l1_s1 l1_s2))) - (let ((l1_s4 (= l1_s0 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 #x01)) + (let ((l1_s3 (bvadd l1_s1 l1_s2))) + (let ((l1_s4 (= l1_s0 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_existsexists_thm_c.gold b/SBVTestSuite/GoldFiles/quantified_sat_existsexists_thm_c.gold index 2cb59b3ea..4c0bd6570 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_existsexists_thm_c.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_existsexists_thm_c.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 (bvsub l1_s1 l1_s0))) - (let ((l1_s3 (bvadd l1_s0 l1_s2))) - (let ((l1_s4 (= l1_s1 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (bvsub l1_s1 l1_s0))) + (let ((l1_s3 (bvadd l1_s0 l1_s2))) + (let ((l1_s4 (= l1_s1 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_existsexists_thm_p.gold b/SBVTestSuite/GoldFiles/quantified_sat_existsexists_thm_p.gold index 2cb59b3ea..4c0bd6570 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_existsexists_thm_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_existsexists_thm_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 (bvsub l1_s1 l1_s0))) - (let ((l1_s3 (bvadd l1_s0 l1_s2))) - (let ((l1_s4 (= l1_s1 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (bvsub l1_s1 l1_s0))) + (let ((l1_s3 (bvadd l1_s0 l1_s2))) + (let ((l1_s4 (= l1_s1 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_existsforall_contradiction_c.gold b/SBVTestSuite/GoldFiles/quantified_sat_existsforall_contradiction_c.gold index 3bec68505..6ab0c6ab2 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_existsforall_contradiction_c.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_existsforall_contradiction_c.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8))) (forall ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 (= l1_s0 l1_s1))) - (let ((l1_s3 (distinct l1_s0 l1_s1))) - (let ((l1_s4 (and l1_s2 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (= l1_s0 l1_s1))) + (let ((l1_s3 (distinct l1_s0 l1_s1))) + (let ((l1_s4 (and l1_s2 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_existsforall_contradiction_p.gold b/SBVTestSuite/GoldFiles/quantified_sat_existsforall_contradiction_p.gold index 3bec68505..6ab0c6ab2 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_existsforall_contradiction_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_existsforall_contradiction_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8))) (forall ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 (= l1_s0 l1_s1))) - (let ((l1_s3 (distinct l1_s0 l1_s1))) - (let ((l1_s4 (and l1_s2 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (= l1_s0 l1_s1))) + (let ((l1_s3 (distinct l1_s0 l1_s1))) + (let ((l1_s4 (and l1_s2 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_existsforall_satisfiable_c.gold b/SBVTestSuite/GoldFiles/quantified_sat_existsforall_satisfiable_c.gold index 772f98aa3..6cfe393b1 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_existsforall_satisfiable_c.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_existsforall_satisfiable_c.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8))) (forall ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 #x01)) - (let ((l1_s3 (bvadd l1_s1 l1_s2))) - (let ((l1_s4 (= l1_s0 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 #x01)) + (let ((l1_s3 (bvadd l1_s1 l1_s2))) + (let ((l1_s4 (= l1_s0 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_existsforall_satisfiable_p.gold b/SBVTestSuite/GoldFiles/quantified_sat_existsforall_satisfiable_p.gold index 772f98aa3..6cfe393b1 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_existsforall_satisfiable_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_existsforall_satisfiable_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8))) (forall ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 #x01)) - (let ((l1_s3 (bvadd l1_s1 l1_s2))) - (let ((l1_s4 (= l1_s0 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 #x01)) + (let ((l1_s3 (bvadd l1_s1 l1_s2))) + (let ((l1_s4 (= l1_s0 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_existsforall_thm_c.gold b/SBVTestSuite/GoldFiles/quantified_sat_existsforall_thm_c.gold index f8b3a2610..277a53ef0 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_existsforall_thm_c.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_existsforall_thm_c.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8))) (forall ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 (bvsub l1_s1 l1_s0))) - (let ((l1_s3 (bvadd l1_s0 l1_s2))) - (let ((l1_s4 (= l1_s1 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (bvsub l1_s1 l1_s0))) + (let ((l1_s3 (bvadd l1_s0 l1_s2))) + (let ((l1_s4 (= l1_s1 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_existsforall_thm_p.gold b/SBVTestSuite/GoldFiles/quantified_sat_existsforall_thm_p.gold index f8b3a2610..277a53ef0 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_existsforall_thm_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_existsforall_thm_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (exists ((l1_s0 (_ BitVec 8))) (forall ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 (bvsub l1_s1 l1_s0))) - (let ((l1_s3 (bvadd l1_s0 l1_s2))) - (let ((l1_s4 (= l1_s1 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (bvsub l1_s1 l1_s0))) + (let ((l1_s3 (bvadd l1_s0 l1_s2))) + (let ((l1_s4 (= l1_s1 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_forallexists_contradiction_c.gold b/SBVTestSuite/GoldFiles/quantified_sat_forallexists_contradiction_c.gold index 6588408d4..8dae7502d 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_forallexists_contradiction_c.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_forallexists_contradiction_c.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8))) (exists ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 (= l1_s0 l1_s1))) - (let ((l1_s3 (distinct l1_s0 l1_s1))) - (let ((l1_s4 (and l1_s2 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (= l1_s0 l1_s1))) + (let ((l1_s3 (distinct l1_s0 l1_s1))) + (let ((l1_s4 (and l1_s2 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_forallexists_contradiction_p.gold b/SBVTestSuite/GoldFiles/quantified_sat_forallexists_contradiction_p.gold index 6588408d4..8dae7502d 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_forallexists_contradiction_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_forallexists_contradiction_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8))) (exists ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 (= l1_s0 l1_s1))) - (let ((l1_s3 (distinct l1_s0 l1_s1))) - (let ((l1_s4 (and l1_s2 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (= l1_s0 l1_s1))) + (let ((l1_s3 (distinct l1_s0 l1_s1))) + (let ((l1_s4 (and l1_s2 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_forallexists_satisfiable_c.gold b/SBVTestSuite/GoldFiles/quantified_sat_forallexists_satisfiable_c.gold index 7decb1d0f..c7a95d63e 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_forallexists_satisfiable_c.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_forallexists_satisfiable_c.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8))) (exists ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 #x01)) - (let ((l1_s3 (bvadd l1_s1 l1_s2))) - (let ((l1_s4 (= l1_s0 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 #x01)) + (let ((l1_s3 (bvadd l1_s1 l1_s2))) + (let ((l1_s4 (= l1_s0 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_forallexists_satisfiable_p.gold b/SBVTestSuite/GoldFiles/quantified_sat_forallexists_satisfiable_p.gold index 7decb1d0f..c7a95d63e 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_forallexists_satisfiable_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_forallexists_satisfiable_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8))) (exists ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 #x01)) - (let ((l1_s3 (bvadd l1_s1 l1_s2))) - (let ((l1_s4 (= l1_s0 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 #x01)) + (let ((l1_s3 (bvadd l1_s1 l1_s2))) + (let ((l1_s4 (= l1_s0 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_forallexists_thm_c.gold b/SBVTestSuite/GoldFiles/quantified_sat_forallexists_thm_c.gold index 95cbe18e9..ae0b5dc4e 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_forallexists_thm_c.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_forallexists_thm_c.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8))) (exists ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 (bvsub l1_s1 l1_s0))) - (let ((l1_s3 (bvadd l1_s0 l1_s2))) - (let ((l1_s4 (= l1_s1 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (bvsub l1_s1 l1_s0))) + (let ((l1_s3 (bvadd l1_s0 l1_s2))) + (let ((l1_s4 (= l1_s1 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_forallexists_thm_p.gold b/SBVTestSuite/GoldFiles/quantified_sat_forallexists_thm_p.gold index 95cbe18e9..ae0b5dc4e 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_forallexists_thm_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_forallexists_thm_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8))) (exists ((l1_s1 (_ BitVec 8))) - (let ((l1_s2 (bvsub l1_s1 l1_s0))) - (let ((l1_s3 (bvadd l1_s0 l1_s2))) - (let ((l1_s4 (= l1_s1 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (bvsub l1_s1 l1_s0))) + (let ((l1_s3 (bvadd l1_s0 l1_s2))) + (let ((l1_s4 (= l1_s1 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_forallforall_contradiction_c.gold b/SBVTestSuite/GoldFiles/quantified_sat_forallforall_contradiction_c.gold index 433aec36c..82ee2c9fc 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_forallforall_contradiction_c.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_forallforall_contradiction_c.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 (= l1_s0 l1_s1))) - (let ((l1_s3 (distinct l1_s0 l1_s1))) - (let ((l1_s4 (and l1_s2 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (= l1_s0 l1_s1))) + (let ((l1_s3 (distinct l1_s0 l1_s1))) + (let ((l1_s4 (and l1_s2 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_forallforall_contradiction_p.gold b/SBVTestSuite/GoldFiles/quantified_sat_forallforall_contradiction_p.gold index 433aec36c..82ee2c9fc 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_forallforall_contradiction_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_forallforall_contradiction_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 (= l1_s0 l1_s1))) - (let ((l1_s3 (distinct l1_s0 l1_s1))) - (let ((l1_s4 (and l1_s2 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (= l1_s0 l1_s1))) + (let ((l1_s3 (distinct l1_s0 l1_s1))) + (let ((l1_s4 (and l1_s2 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_forallforall_satisfiable_c.gold b/SBVTestSuite/GoldFiles/quantified_sat_forallforall_satisfiable_c.gold index 69548af27..e573fbe04 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_forallforall_satisfiable_c.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_forallforall_satisfiable_c.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 #x01)) - (let ((l1_s3 (bvadd l1_s1 l1_s2))) - (let ((l1_s4 (= l1_s0 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 #x01)) + (let ((l1_s3 (bvadd l1_s1 l1_s2))) + (let ((l1_s4 (= l1_s0 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_forallforall_satisfiable_p.gold b/SBVTestSuite/GoldFiles/quantified_sat_forallforall_satisfiable_p.gold index 69548af27..e573fbe04 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_forallforall_satisfiable_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_forallforall_satisfiable_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 #x01)) - (let ((l1_s3 (bvadd l1_s1 l1_s2))) - (let ((l1_s4 (= l1_s0 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 #x01)) + (let ((l1_s3 (bvadd l1_s1 l1_s2))) + (let ((l1_s4 (= l1_s0 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_forallforall_thm_c.gold b/SBVTestSuite/GoldFiles/quantified_sat_forallforall_thm_c.gold index 360efefde..7a2007b02 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_forallforall_thm_c.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_forallforall_thm_c.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 (bvsub l1_s1 l1_s0))) - (let ((l1_s3 (bvadd l1_s0 l1_s2))) - (let ((l1_s4 (= l1_s1 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (bvsub l1_s1 l1_s0))) + (let ((l1_s3 (bvadd l1_s0 l1_s2))) + (let ((l1_s4 (= l1_s1 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/quantified_sat_forallforall_thm_p.gold b/SBVTestSuite/GoldFiles/quantified_sat_forallforall_thm_p.gold index 360efefde..7a2007b02 100644 --- a/SBVTestSuite/GoldFiles/quantified_sat_forallforall_thm_p.gold +++ b/SBVTestSuite/GoldFiles/quantified_sat_forallforall_thm_p.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 (_ BitVec 8)) (l1_s1 (_ BitVec 8))) - (let ((l1_s2 (bvsub l1_s1 l1_s0))) - (let ((l1_s3 (bvadd l1_s0 l1_s2))) - (let ((l1_s4 (= l1_s1 l1_s3))) - l1_s4))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 (bvsub l1_s1 l1_s0))) + (let ((l1_s3 (bvadd l1_s0 l1_s2))) + (let ((l1_s4 (= l1_s1 l1_s3))) + l1_s4))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/query_Chars1.gold b/SBVTestSuite/GoldFiles/query_Chars1.gold index 4c5818706..92ca6c3da 100644 --- a/SBVTestSuite/GoldFiles/query_Chars1.gold +++ b/SBVTestSuite/GoldFiles/query_Chars1.gold @@ -17,15 +17,12 @@ [GOOD] (assert (= 1 (str.len s0))) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s1 () Int (str.to_code s0)) [GOOD] (define-fun s3 () Bool (>= s1 s2)) [GOOD] (define-fun s5 () Bool (< s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/query_Interpolant1.gold b/SBVTestSuite/GoldFiles/query_Interpolant1.gold index aa952e804..a3cb50945 100644 --- a/SBVTestSuite/GoldFiles/query_Interpolant1.gold +++ b/SBVTestSuite/GoldFiles/query_Interpolant1.gold @@ -17,7 +17,6 @@ [GOOD] (declare-fun s3 () Int) ; tracks user variable "d" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -28,8 +27,6 @@ [GOOD] (define-fun s8 () Bool (= s2 s3)) [GOOD] (define-fun s9 () Bool (not s8)) [GOOD] (define-fun s10 () Bool (and s7 s9)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (! s6 :interpolation-group |c1|)) diff --git a/SBVTestSuite/GoldFiles/query_Interpolant2.gold b/SBVTestSuite/GoldFiles/query_Interpolant2.gold index ca5209535..eb02883df 100644 --- a/SBVTestSuite/GoldFiles/query_Interpolant2.gold +++ b/SBVTestSuite/GoldFiles/query_Interpolant2.gold @@ -17,7 +17,6 @@ [GOOD] (declare-fun s3 () Int) ; tracks user variable "d" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] (declare-fun f (Int) Int) [GOOD] (declare-fun g (Int) Int) @@ -33,8 +32,6 @@ [GOOD] (define-fun s11 () Int (g s3)) [GOOD] (define-fun s12 () Bool (distinct s10 s11)) [GOOD] (define-fun s13 () Bool (and s9 s12)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (! s8 :interpolation-group |c1|)) diff --git a/SBVTestSuite/GoldFiles/query_Interpolant3.gold b/SBVTestSuite/GoldFiles/query_Interpolant3.gold index 9688bba54..3a914a864 100644 --- a/SBVTestSuite/GoldFiles/query_Interpolant3.gold +++ b/SBVTestSuite/GoldFiles/query_Interpolant3.gold @@ -17,12 +17,9 @@ [GOOD] (declare-fun s3 () Int) ; tracks user variable "d" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (define-fun s4 () Bool (= s0 s1)) diff --git a/SBVTestSuite/GoldFiles/query_Interpolant4.gold b/SBVTestSuite/GoldFiles/query_Interpolant4.gold index e27034c9e..6313dcc18 100644 --- a/SBVTestSuite/GoldFiles/query_Interpolant4.gold +++ b/SBVTestSuite/GoldFiles/query_Interpolant4.gold @@ -17,12 +17,9 @@ [GOOD] (declare-fun s3 () Int) ; tracks user variable "d" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (declare-fun f (Int) Int) diff --git a/SBVTestSuite/GoldFiles/query_ListOfMaybe.gold b/SBVTestSuite/GoldFiles/query_ListOfMaybe.gold index 7aa4d901b..78664c4cb 100644 --- a/SBVTestSuite/GoldFiles/query_ListOfMaybe.gold +++ b/SBVTestSuite/GoldFiles/query_ListOfMaybe.gold @@ -24,7 +24,6 @@ [GOOD] (assert (forall ((seq0 Int)) (=> (and (>= seq0 0) (< seq0 (seq.len s0))) (=> ((_ is (just_SBVMaybe (String) (SBVMaybe String))) (seq.nth s0 seq0)) (= 1 (str.len (get_just_SBVMaybe (seq.nth s0 seq0)))))))) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -38,8 +37,6 @@ [GOOD] (define-fun s11 () (SBVMaybe String) (seq.nth s10 s4)) [GOOD] (define-fun s12 () Bool ((_ is (nothing_SBVMaybe () (SBVMaybe String))) s11)) [GOOD] (define-fun s13 () Bool (ite s12 true false)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/query_ListOfSum.gold b/SBVTestSuite/GoldFiles/query_ListOfSum.gold index c489854e1..a4f9fdedb 100644 --- a/SBVTestSuite/GoldFiles/query_ListOfSum.gold +++ b/SBVTestSuite/GoldFiles/query_ListOfSum.gold @@ -24,7 +24,6 @@ [GOOD] (assert (forall ((seq0 Int)) (=> (and (>= seq0 0) (< seq0 (seq.len s0))) (=> ((_ is (right_SBVEither (String) (SBVEither Int String))) (seq.nth s0 seq0)) (= 1 (str.len (get_right_SBVEither (seq.nth s0 seq0)))))))) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -38,8 +37,6 @@ [GOOD] (define-fun s11 () (SBVEither Int String) (seq.nth s10 s4)) [GOOD] (define-fun s12 () Bool ((_ is (left_SBVEither (Int) (SBVEither Int String))) s11)) [GOOD] (define-fun s13 () Bool (ite s12 false true)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/query_Lists1.gold b/SBVTestSuite/GoldFiles/query_Lists1.gold index 946285efc..045abfb06 100644 --- a/SBVTestSuite/GoldFiles/query_Lists1.gold +++ b/SBVTestSuite/GoldFiles/query_Lists1.gold @@ -18,13 +18,10 @@ [GOOD] (declare-fun s0 () (Seq Int)) ; tracks user variable "a" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s2 () Bool (= s0 s1)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s2) diff --git a/SBVTestSuite/GoldFiles/query_Maybe.gold b/SBVTestSuite/GoldFiles/query_Maybe.gold index 21d0a5d0a..487653072 100644 --- a/SBVTestSuite/GoldFiles/query_Maybe.gold +++ b/SBVTestSuite/GoldFiles/query_Maybe.gold @@ -21,7 +21,6 @@ [GOOD] (declare-fun s0 () (SBVMaybe Int)) ; tracks user variable "a" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -29,8 +28,6 @@ [GOOD] (define-fun s3 () Bool (= s1 s2)) [GOOD] (define-fun s4 () Bool ((_ is (nothing_SBVMaybe () (SBVMaybe Int))) s0)) [GOOD] (define-fun s5 () Bool (ite s4 false s3)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s5) diff --git a/SBVTestSuite/GoldFiles/query_Strings1.gold b/SBVTestSuite/GoldFiles/query_Strings1.gold index a515c9321..e20d794d0 100644 --- a/SBVTestSuite/GoldFiles/query_Strings1.gold +++ b/SBVTestSuite/GoldFiles/query_Strings1.gold @@ -14,13 +14,10 @@ [GOOD] (declare-fun s0 () String) ; tracks user variable "a" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s1 () Bool (str.in.re s0 ((_ re.loop 5 5) (str.to.re "xyz")))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s1) diff --git a/SBVTestSuite/GoldFiles/query_SumMaybeBoth.gold b/SBVTestSuite/GoldFiles/query_SumMaybeBoth.gold index b8ac62cf8..a230a0a9c 100644 --- a/SBVTestSuite/GoldFiles/query_SumMaybeBoth.gold +++ b/SBVTestSuite/GoldFiles/query_SumMaybeBoth.gold @@ -13,12 +13,9 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (set-option :pp.max_depth 4294967295) diff --git a/SBVTestSuite/GoldFiles/query_Sums.gold b/SBVTestSuite/GoldFiles/query_Sums.gold index c751247c3..4118e10e2 100644 --- a/SBVTestSuite/GoldFiles/query_Sums.gold +++ b/SBVTestSuite/GoldFiles/query_Sums.gold @@ -22,7 +22,6 @@ [GOOD] (assert (=> ((_ is (right_SBVEither (String) (SBVEither Int String))) s0) (= 1 (str.len (get_right_SBVEither s0))))) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -30,8 +29,6 @@ [GOOD] (define-fun s3 () Bool (= s1 s2)) [GOOD] (define-fun s4 () Bool ((_ is (left_SBVEither (Int) (SBVEither Int String))) s0)) [GOOD] (define-fun s5 () Bool (ite s4 s3 false)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s5) diff --git a/SBVTestSuite/GoldFiles/query_Tuples1.gold b/SBVTestSuite/GoldFiles/query_Tuples1.gold index 32a8a4ea2..9fa62e09b 100644 --- a/SBVTestSuite/GoldFiles/query_Tuples1.gold +++ b/SBVTestSuite/GoldFiles/query_Tuples1.gold @@ -22,14 +22,11 @@ [GOOD] (assert (= 1 (str.len (proj_2_SBVTuple2 s0)))) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s1 () Int (proj_1_SBVTuple2 s0)) [GOOD] (define-fun s3 () Bool (= s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/query_Tuples2.gold b/SBVTestSuite/GoldFiles/query_Tuples2.gold index 56a0b1905..cc32a6d7b 100644 --- a/SBVTestSuite/GoldFiles/query_Tuples2.gold +++ b/SBVTestSuite/GoldFiles/query_Tuples2.gold @@ -23,15 +23,12 @@ [GOOD] (assert (= 1 (str.len (proj_1_SBVTuple2 (proj_2_SBVTuple2 s0))))) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s1 () (SBVTuple2 String SBVTuple0) (proj_2_SBVTuple2 s0)) [GOOD] (define-fun s2 () String (proj_1_SBVTuple2 s1)) [GOOD] (define-fun s4 () Bool (= s2 s3)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s4) diff --git a/SBVTestSuite/GoldFiles/query_abc.gold b/SBVTestSuite/GoldFiles/query_abc.gold index 0f29f95f1..c2a04b94e 100644 --- a/SBVTestSuite/GoldFiles/query_abc.gold +++ b/SBVTestSuite/GoldFiles/query_abc.gold @@ -16,14 +16,11 @@ [ISSUE] (declare-fun s1 () (_ BitVec 32)) ; tracks user variable "b" [ISSUE] ; --- constant tables --- [ISSUE] ; --- non-constant tables --- -[ISSUE] ; --- arrays --- [ISSUE] ; --- uninterpreted constants --- [ISSUE] ; --- user defined functions --- [ISSUE] ; --- assignments --- [ISSUE] (define-fun s3 () Bool (bvsgt s0 s2)) [ISSUE] (define-fun s4 () Bool (bvsgt s1 s2)) -[ISSUE] ; --- arrayDelayeds --- -[ISSUE] ; --- arraySetups --- [ISSUE] ; --- delayedEqualities --- [ISSUE] ; --- formula --- [ISSUE] (assert s3) diff --git a/SBVTestSuite/GoldFiles/query_bitwuzla.gold b/SBVTestSuite/GoldFiles/query_bitwuzla.gold index a5713c863..da03e9828 100644 --- a/SBVTestSuite/GoldFiles/query_bitwuzla.gold +++ b/SBVTestSuite/GoldFiles/query_bitwuzla.gold @@ -14,14 +14,11 @@ [GOOD] (declare-fun s1 () (_ BitVec 32)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (bvsgt s0 s2)) [GOOD] (define-fun s4 () Bool (bvsgt s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/query_boolector.gold b/SBVTestSuite/GoldFiles/query_boolector.gold index 9c8de005f..a225eed11 100644 --- a/SBVTestSuite/GoldFiles/query_boolector.gold +++ b/SBVTestSuite/GoldFiles/query_boolector.gold @@ -14,14 +14,11 @@ [GOOD] (declare-fun s1 () (_ BitVec 32)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (bvsgt s0 s2)) [GOOD] (define-fun s4 () Bool (bvsgt s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/query_cvc4.gold b/SBVTestSuite/GoldFiles/query_cvc4.gold index 1ecfdb5c0..a01617485 100644 --- a/SBVTestSuite/GoldFiles/query_cvc4.gold +++ b/SBVTestSuite/GoldFiles/query_cvc4.gold @@ -15,14 +15,11 @@ [GOOD] (declare-fun s1 () (_ BitVec 32)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (bvsgt s0 s2)) [GOOD] (define-fun s4 () Bool (bvsgt s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (! s3 :named |a > 0|)) diff --git a/SBVTestSuite/GoldFiles/query_cvc5.gold b/SBVTestSuite/GoldFiles/query_cvc5.gold index f719784b1..213a89100 100644 --- a/SBVTestSuite/GoldFiles/query_cvc5.gold +++ b/SBVTestSuite/GoldFiles/query_cvc5.gold @@ -15,14 +15,11 @@ [GOOD] (declare-fun s1 () (_ BitVec 32)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (bvsgt s0 s2)) [GOOD] (define-fun s4 () Bool (bvsgt s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (! s3 :named |a > 0|)) diff --git a/SBVTestSuite/GoldFiles/query_mathsat.gold b/SBVTestSuite/GoldFiles/query_mathsat.gold index c6bf52707..7b7743f25 100644 --- a/SBVTestSuite/GoldFiles/query_mathsat.gold +++ b/SBVTestSuite/GoldFiles/query_mathsat.gold @@ -15,14 +15,11 @@ [GOOD] (declare-fun s1 () (_ BitVec 32)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (bvsgt s0 s2)) [GOOD] (define-fun s4 () Bool (bvsgt s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (! s3 :named |a > 0|)) diff --git a/SBVTestSuite/GoldFiles/query_sumMergeEither1.gold b/SBVTestSuite/GoldFiles/query_sumMergeEither1.gold index 10dfde927..b0d339b4c 100644 --- a/SBVTestSuite/GoldFiles/query_sumMergeEither1.gold +++ b/SBVTestSuite/GoldFiles/query_sumMergeEither1.gold @@ -13,12 +13,9 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (set-option :pp.max_depth 4294967295) diff --git a/SBVTestSuite/GoldFiles/query_sumMergeEither2.gold b/SBVTestSuite/GoldFiles/query_sumMergeEither2.gold index ae1010d5e..87e186de8 100644 --- a/SBVTestSuite/GoldFiles/query_sumMergeEither2.gold +++ b/SBVTestSuite/GoldFiles/query_sumMergeEither2.gold @@ -13,12 +13,9 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (set-option :pp.max_depth 4294967295) diff --git a/SBVTestSuite/GoldFiles/query_sumMergeMaybe1.gold b/SBVTestSuite/GoldFiles/query_sumMergeMaybe1.gold index b440127ae..8699fcdd1 100644 --- a/SBVTestSuite/GoldFiles/query_sumMergeMaybe1.gold +++ b/SBVTestSuite/GoldFiles/query_sumMergeMaybe1.gold @@ -13,12 +13,9 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (set-option :pp.max_depth 4294967295) diff --git a/SBVTestSuite/GoldFiles/query_sumMergeMaybe2.gold b/SBVTestSuite/GoldFiles/query_sumMergeMaybe2.gold index d0dbf86a5..70508abb6 100644 --- a/SBVTestSuite/GoldFiles/query_sumMergeMaybe2.gold +++ b/SBVTestSuite/GoldFiles/query_sumMergeMaybe2.gold @@ -13,12 +13,9 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (set-option :pp.max_depth 4294967295) diff --git a/SBVTestSuite/GoldFiles/query_uiSat_test1.gold b/SBVTestSuite/GoldFiles/query_uiSat_test1.gold index 0b643b83a..8bc60732b 100644 --- a/SBVTestSuite/GoldFiles/query_uiSat_test1.gold +++ b/SBVTestSuite/GoldFiles/query_uiSat_test1.gold @@ -13,16 +13,13 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] (declare-fun q1 (Bool) Bool) [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (q1 false)) -[GOOD] (define-fun s1 () Bool (= false s0)) +[GOOD] (define-fun s1 () Bool (not s0)) [GOOD] (define-fun s2 () Bool (q1 true)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s1) diff --git a/SBVTestSuite/GoldFiles/query_uiSat_test2.gold b/SBVTestSuite/GoldFiles/query_uiSat_test2.gold index 0cf9cd284..550e3af56 100644 --- a/SBVTestSuite/GoldFiles/query_uiSat_test2.gold +++ b/SBVTestSuite/GoldFiles/query_uiSat_test2.gold @@ -13,17 +13,14 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] (declare-fun q2 (Bool Bool) Bool) [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (q2 false true)) -[GOOD] (define-fun s1 () Bool (= false s0)) +[GOOD] (define-fun s1 () Bool (not s0)) [GOOD] (define-fun s2 () Bool (q2 true true)) [GOOD] (define-fun s3 () Bool (q2 true false)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s1) diff --git a/SBVTestSuite/GoldFiles/query_uisatex1.gold b/SBVTestSuite/GoldFiles/query_uisatex1.gold index f91ce8a2e..2bc9003b1 100644 --- a/SBVTestSuite/GoldFiles/query_uisatex1.gold +++ b/SBVTestSuite/GoldFiles/query_uisatex1.gold @@ -49,7 +49,6 @@ [GOOD] (declare-fun s0 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] (declare-fun q1 (Int) Int) [GOOD] (declare-fun q2 (Bool Int) Int) @@ -94,8 +93,6 @@ [GOOD] (define-fun s63 () Bool (= s61 s62)) [GOOD] (define-fun s66 () Int (q5 s64 s65)) [GOOD] (define-fun s68 () Bool (= s66 s67)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s4) diff --git a/SBVTestSuite/GoldFiles/query_uisatex3.gold b/SBVTestSuite/GoldFiles/query_uisatex3.gold index 8912fc2de..c34fe3d57 100644 --- a/SBVTestSuite/GoldFiles/query_uisatex3.gold +++ b/SBVTestSuite/GoldFiles/query_uisatex3.gold @@ -13,19 +13,16 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] (declare-fun y (Int) Int) [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s0 () Bool (forall ((l1_s0 Int)) - (let ((l1_s2 3)) - (let ((l1_s1 (y l1_s0))) - (let ((l1_s3 (* l1_s0 l1_s2))) - (let ((l1_s4 (= l1_s1 l1_s3))) - l1_s4)))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s2 3)) + (let ((l1_s1 (y l1_s0))) + (let ((l1_s3 (* l1_s0 l1_s2))) + (let ((l1_s4 (= l1_s1 l1_s3))) + l1_s4)))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s0) diff --git a/SBVTestSuite/GoldFiles/query_yices.gold b/SBVTestSuite/GoldFiles/query_yices.gold index 12669cefb..264c7cc85 100644 --- a/SBVTestSuite/GoldFiles/query_yices.gold +++ b/SBVTestSuite/GoldFiles/query_yices.gold @@ -14,14 +14,11 @@ [GOOD] (declare-fun s1 () (_ BitVec 32)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (bvsgt s0 s2)) [GOOD] (define-fun s4 () Bool (bvsgt s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (! s3 :named |a > 0|)) diff --git a/SBVTestSuite/GoldFiles/query_z3.gold b/SBVTestSuite/GoldFiles/query_z3.gold index 326545a66..5f44e4910 100644 --- a/SBVTestSuite/GoldFiles/query_z3.gold +++ b/SBVTestSuite/GoldFiles/query_z3.gold @@ -16,14 +16,11 @@ [GOOD] (declare-fun s1 () (_ BitVec 32)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (bvsgt s0 s2)) [GOOD] (define-fun s4 () Bool (bvsgt s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert (! s3 :named |a > 0|)) diff --git a/SBVTestSuite/GoldFiles/reverse.gold b/SBVTestSuite/GoldFiles/reverse.gold index 781b2af89..a64ea2eed 100644 --- a/SBVTestSuite/GoldFiles/reverse.gold +++ b/SBVTestSuite/GoldFiles/reverse.gold @@ -23,7 +23,6 @@ [GOOD] (declare-fun s3 () Int) ; tracks user variable "d" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -115,8 +114,6 @@ [GOOD] (define-fun s92 () (Seq Int) (seq.++ s6 s91)) [GOOD] (define-fun s93 () (Seq Int) (seq.++ s7 s92)) [GOOD] (define-fun s94 () Bool (= s90 s93)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s94) diff --git a/SBVTestSuite/GoldFiles/reverseAlt10.gold b/SBVTestSuite/GoldFiles/reverseAlt10.gold index ff2478e17..7272995b9 100644 --- a/SBVTestSuite/GoldFiles/reverseAlt10.gold +++ b/SBVTestSuite/GoldFiles/reverseAlt10.gold @@ -20,7 +20,6 @@ [GOOD] (declare-fun s0 () (Seq Int)) ; tracks user variable "xs" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -121,8 +120,6 @@ [GOOD] (define-fun s98 () (Seq Int) (ite s9 s78 s97)) [GOOD] (define-fun s99 () (Seq Int) (ite s3 s4 s98)) [GOOD] (define-fun s100 () Bool (distinct s80 s99)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s100) diff --git a/SBVTestSuite/GoldFiles/safe1.gold b/SBVTestSuite/GoldFiles/safe1.gold index 9b895eb86..fccc81e8c 100644 --- a/SBVTestSuite/GoldFiles/safe1.gold +++ b/SBVTestSuite/GoldFiles/safe1.gold @@ -16,15 +16,12 @@ [GOOD] (declare-fun s0 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s2 () Bool (= s0 s1)) [GOOD] (define-fun s4 () Bool (> s0 s3)) [GOOD] (define-fun s5 () Bool (not s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (push 1) diff --git a/SBVTestSuite/GoldFiles/safe2.gold b/SBVTestSuite/GoldFiles/safe2.gold index 72a364d76..6ca696bb2 100644 --- a/SBVTestSuite/GoldFiles/safe2.gold +++ b/SBVTestSuite/GoldFiles/safe2.gold @@ -16,14 +16,11 @@ [GOOD] (declare-fun s0 () Int) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (> s0 s2)) [GOOD] (define-fun s4 () Bool (not s3)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (push 1) diff --git a/SBVTestSuite/GoldFiles/seqConcat.gold b/SBVTestSuite/GoldFiles/seqConcat.gold index 1850ab7da..c409a37c2 100644 --- a/SBVTestSuite/GoldFiles/seqConcat.gold +++ b/SBVTestSuite/GoldFiles/seqConcat.gold @@ -13,12 +13,9 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [SEND] (check-sat) diff --git a/SBVTestSuite/GoldFiles/seqConcatBad.gold b/SBVTestSuite/GoldFiles/seqConcatBad.gold index 18e01aaa3..35f0c621c 100644 --- a/SBVTestSuite/GoldFiles/seqConcatBad.gold +++ b/SBVTestSuite/GoldFiles/seqConcatBad.gold @@ -13,12 +13,9 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert false) diff --git a/SBVTestSuite/GoldFiles/seqExamples1.gold b/SBVTestSuite/GoldFiles/seqExamples1.gold index 1850ab7da..c409a37c2 100644 --- a/SBVTestSuite/GoldFiles/seqExamples1.gold +++ b/SBVTestSuite/GoldFiles/seqExamples1.gold @@ -13,12 +13,9 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [SEND] (check-sat) diff --git a/SBVTestSuite/GoldFiles/seqExamples2.gold b/SBVTestSuite/GoldFiles/seqExamples2.gold index ad1586408..41acf16a7 100644 --- a/SBVTestSuite/GoldFiles/seqExamples2.gold +++ b/SBVTestSuite/GoldFiles/seqExamples2.gold @@ -19,15 +19,12 @@ [GOOD] (declare-fun s0 () (Seq Int)) ; tracks user variable "a" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s2 () (Seq Int) (seq.++ s0 s1)) [GOOD] (define-fun s4 () (Seq Int) (seq.++ s3 s0)) [GOOD] (define-fun s5 () Bool (= s2 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s5) diff --git a/SBVTestSuite/GoldFiles/seqExamples3.gold b/SBVTestSuite/GoldFiles/seqExamples3.gold index 6cf346084..6e4a87353 100644 --- a/SBVTestSuite/GoldFiles/seqExamples3.gold +++ b/SBVTestSuite/GoldFiles/seqExamples3.gold @@ -22,7 +22,6 @@ [GOOD] (declare-fun s2 () (Seq Int)) ; tracks user variable "c" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -32,8 +31,6 @@ [GOOD] (define-fun s8 () Bool (= s6 s7)) [GOOD] (define-fun s10 () Bool (= s1 s9)) [GOOD] (define-fun s11 () Bool (not s10)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s5) diff --git a/SBVTestSuite/GoldFiles/seqExamples4.gold b/SBVTestSuite/GoldFiles/seqExamples4.gold index 89a059fc1..18a053a7d 100644 --- a/SBVTestSuite/GoldFiles/seqExamples4.gold +++ b/SBVTestSuite/GoldFiles/seqExamples4.gold @@ -21,7 +21,6 @@ [GOOD] (declare-fun s1 () (Seq Int)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -30,8 +29,6 @@ [GOOD] (define-fun s6 () Bool (= s3 s5)) [GOOD] (define-fun s7 () Int (seq.len s0)) [GOOD] (define-fun s9 () Bool (<= s7 s8)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s6) diff --git a/SBVTestSuite/GoldFiles/seqExamples5.gold b/SBVTestSuite/GoldFiles/seqExamples5.gold index 8f445730a..493239dc5 100644 --- a/SBVTestSuite/GoldFiles/seqExamples5.gold +++ b/SBVTestSuite/GoldFiles/seqExamples5.gold @@ -22,7 +22,6 @@ [GOOD] (declare-fun s2 () (Seq Int)) ; tracks user variable "c" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -37,8 +36,6 @@ [GOOD] (define-fun s14 () (Seq Int) (seq.++ s12 s0)) [GOOD] (define-fun s15 () Bool (= s13 s14)) [GOOD] (define-fun s16 () Bool (not s15)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s9) diff --git a/SBVTestSuite/GoldFiles/seqExamples6.gold b/SBVTestSuite/GoldFiles/seqExamples6.gold index be5b36be9..ddf4b67b2 100644 --- a/SBVTestSuite/GoldFiles/seqExamples6.gold +++ b/SBVTestSuite/GoldFiles/seqExamples6.gold @@ -19,7 +19,6 @@ [GOOD] (declare-fun s2 () (Seq Int)) ; tracks user variable "c" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -27,8 +26,6 @@ [GOOD] (define-fun s4 () Bool (seq.contains s1 s2)) [GOOD] (define-fun s5 () Bool (seq.contains s0 s2)) [GOOD] (define-fun s6 () Bool (not s5)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/seqExamples7.gold b/SBVTestSuite/GoldFiles/seqExamples7.gold index 71e582cb4..157989728 100644 --- a/SBVTestSuite/GoldFiles/seqExamples7.gold +++ b/SBVTestSuite/GoldFiles/seqExamples7.gold @@ -19,7 +19,6 @@ [GOOD] (declare-fun s2 () (Seq Int)) ; tracks user variable "c" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -29,8 +28,6 @@ [GOOD] (define-fun s6 () Bool (not s5)) [GOOD] (define-fun s7 () Bool (seq.contains s2 s1)) [GOOD] (define-fun s8 () Bool (not s7)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/seqExamples8.gold b/SBVTestSuite/GoldFiles/seqExamples8.gold index aaa549b6b..705728876 100644 --- a/SBVTestSuite/GoldFiles/seqExamples8.gold +++ b/SBVTestSuite/GoldFiles/seqExamples8.gold @@ -19,7 +19,6 @@ [GOOD] (declare-fun s2 () (Seq Int)) ; tracks user variable "c" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -33,8 +32,6 @@ [GOOD] (define-fun s10 () (Seq Int) (seq.++ s1 s2)) [GOOD] (define-fun s11 () Bool (= s0 s10)) [GOOD] (define-fun s12 () Bool (not s11)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/seqIndexOf.gold b/SBVTestSuite/GoldFiles/seqIndexOf.gold index 1850ab7da..c409a37c2 100644 --- a/SBVTestSuite/GoldFiles/seqIndexOf.gold +++ b/SBVTestSuite/GoldFiles/seqIndexOf.gold @@ -13,12 +13,9 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [SEND] (check-sat) diff --git a/SBVTestSuite/GoldFiles/seqIndexOfBad.gold b/SBVTestSuite/GoldFiles/seqIndexOfBad.gold index 18e01aaa3..35f0c621c 100644 --- a/SBVTestSuite/GoldFiles/seqIndexOfBad.gold +++ b/SBVTestSuite/GoldFiles/seqIndexOfBad.gold @@ -13,12 +13,9 @@ [GOOD] ; --- top level inputs --- [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert false) diff --git a/SBVTestSuite/GoldFiles/set_compl1.gold b/SBVTestSuite/GoldFiles/set_compl1.gold index 07238de81..ecc96f673 100644 --- a/SBVTestSuite/GoldFiles/set_compl1.gold +++ b/SBVTestSuite/GoldFiles/set_compl1.gold @@ -18,13 +18,10 @@ [GOOD] (declare-fun s0 () (Array Int Bool)) ; tracks user variable "a" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s2 () Bool (= s0 s1)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s2) diff --git a/SBVTestSuite/GoldFiles/set_delete1.gold b/SBVTestSuite/GoldFiles/set_delete1.gold index a52f98b00..ba7c5016d 100644 --- a/SBVTestSuite/GoldFiles/set_delete1.gold +++ b/SBVTestSuite/GoldFiles/set_delete1.gold @@ -20,14 +20,11 @@ [GOOD] (declare-fun s1 () (Array Int Bool)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/set_diff1.gold b/SBVTestSuite/GoldFiles/set_diff1.gold index 6a9936e6f..ab27f2e9f 100644 --- a/SBVTestSuite/GoldFiles/set_diff1.gold +++ b/SBVTestSuite/GoldFiles/set_diff1.gold @@ -19,14 +19,11 @@ [GOOD] (declare-fun s1 () (Array Int Bool)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () Bool (= s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/set_insert1.gold b/SBVTestSuite/GoldFiles/set_insert1.gold index 790f84cd0..7162fab78 100644 --- a/SBVTestSuite/GoldFiles/set_insert1.gold +++ b/SBVTestSuite/GoldFiles/set_insert1.gold @@ -20,14 +20,11 @@ [GOOD] (declare-fun s1 () (Array Int Bool)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/set_intersect1.gold b/SBVTestSuite/GoldFiles/set_intersect1.gold index 522586454..92bfc853e 100644 --- a/SBVTestSuite/GoldFiles/set_intersect1.gold +++ b/SBVTestSuite/GoldFiles/set_intersect1.gold @@ -19,14 +19,11 @@ [GOOD] (declare-fun s1 () (Array Int Bool)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () Bool (= s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/set_member1.gold b/SBVTestSuite/GoldFiles/set_member1.gold index ccd43641a..3866b0718 100644 --- a/SBVTestSuite/GoldFiles/set_member1.gold +++ b/SBVTestSuite/GoldFiles/set_member1.gold @@ -20,14 +20,11 @@ [GOOD] (declare-fun s1 () (Array Int Bool)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/set_notMember1.gold b/SBVTestSuite/GoldFiles/set_notMember1.gold index 370e6f1e3..f6982f3d4 100644 --- a/SBVTestSuite/GoldFiles/set_notMember1.gold +++ b/SBVTestSuite/GoldFiles/set_notMember1.gold @@ -20,14 +20,11 @@ [GOOD] (declare-fun s1 () (Array Int Bool)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s5 () Bool (= s1 s4)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/set_psubset1.gold b/SBVTestSuite/GoldFiles/set_psubset1.gold index a1f04a8d3..6938ec175 100644 --- a/SBVTestSuite/GoldFiles/set_psubset1.gold +++ b/SBVTestSuite/GoldFiles/set_psubset1.gold @@ -19,14 +19,11 @@ [GOOD] (declare-fun s1 () (Array Int Bool)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () Bool (= s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) @@ -38,31 +35,27 @@ [SEND] (get-value (s1)) [RECV] ((s1 (store ((as const (Array Int Bool)) false) 0 true))) [GOOD] (define-fun s5 () Bool (subset s0 s1)) -[GOOD] (define-fun s6 () Bool (= s0 s1)) -[GOOD] (define-fun s7 () Bool (not s6)) -[GOOD] (define-fun s8 () Bool (and s5 s7)) -[SEND] (get-value (s8)) -[RECV] ((s8 false)) -[GOOD] (define-fun s9 () (Array Int Bool) (complement s1)) -[GOOD] (define-fun s10 () Bool (subset s0 s9)) -[GOOD] (define-fun s11 () Bool (= s0 s9)) -[GOOD] (define-fun s12 () Bool (not s11)) -[GOOD] (define-fun s13 () Bool (and s10 s12)) -[SEND] (get-value (s13)) -[RECV] ((s13 false)) -[GOOD] (define-fun s14 () (Array Int Bool) (complement s0)) -[GOOD] (define-fun s15 () Bool (subset s14 s1)) -[GOOD] (define-fun s16 () Bool (= s14 s1)) -[GOOD] (define-fun s17 () Bool (not s16)) -[GOOD] (define-fun s18 () Bool (and s15 s17)) +[GOOD] (define-fun s6 () Bool (distinct s0 s1)) +[GOOD] (define-fun s7 () Bool (and s5 s6)) +[SEND] (get-value (s7)) +[RECV] ((s7 false)) +[GOOD] (define-fun s8 () (Array Int Bool) (complement s1)) +[GOOD] (define-fun s9 () Bool (subset s0 s8)) +[GOOD] (define-fun s10 () Bool (distinct s0 s8)) +[GOOD] (define-fun s11 () Bool (and s9 s10)) +[SEND] (get-value (s11)) +[RECV] ((s11 false)) +[GOOD] (define-fun s12 () (Array Int Bool) (complement s0)) +[GOOD] (define-fun s13 () Bool (subset s12 s1)) +[GOOD] (define-fun s14 () Bool (distinct s1 s12)) +[GOOD] (define-fun s15 () Bool (and s13 s14)) +[SEND] (get-value (s15)) +[RECV] ((s15 false)) +[GOOD] (define-fun s16 () Bool (subset s12 s8)) +[GOOD] (define-fun s17 () Bool (distinct s8 s12)) +[GOOD] (define-fun s18 () Bool (and s16 s17)) [SEND] (get-value (s18)) [RECV] ((s18 false)) -[GOOD] (define-fun s19 () Bool (subset s14 s9)) -[GOOD] (define-fun s20 () Bool (= s14 s9)) -[GOOD] (define-fun s21 () Bool (not s20)) -[GOOD] (define-fun s22 () Bool (and s19 s21)) -[SEND] (get-value (s22)) -[RECV] ((s22 false)) *** Solver : Z3 *** Exit code: ExitSuccess diff --git a/SBVTestSuite/GoldFiles/set_subset1.gold b/SBVTestSuite/GoldFiles/set_subset1.gold index db74d3480..4e2bf503d 100644 --- a/SBVTestSuite/GoldFiles/set_subset1.gold +++ b/SBVTestSuite/GoldFiles/set_subset1.gold @@ -19,14 +19,11 @@ [GOOD] (declare-fun s1 () (Array Int Bool)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () Bool (= s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/set_tupleSet.gold b/SBVTestSuite/GoldFiles/set_tupleSet.gold index 21c531b99..acaa3a740 100644 --- a/SBVTestSuite/GoldFiles/set_tupleSet.gold +++ b/SBVTestSuite/GoldFiles/set_tupleSet.gold @@ -21,13 +21,10 @@ [GOOD] (declare-fun s0 () (SBVTuple2 (Array Bool Bool) (Array Bool Bool))) [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s2 () Bool (distinct s0 s1)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s2) diff --git a/SBVTestSuite/GoldFiles/set_uninterp2.gold b/SBVTestSuite/GoldFiles/set_uninterp2.gold index bafb1a480..8bd2b250c 100644 --- a/SBVTestSuite/GoldFiles/set_uninterp2.gold +++ b/SBVTestSuite/GoldFiles/set_uninterp2.gold @@ -22,13 +22,10 @@ [GOOD] (declare-fun s1 () (Array E Bool)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s2 () Bool (distinct s0 s1)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s2) diff --git a/SBVTestSuite/GoldFiles/set_union1.gold b/SBVTestSuite/GoldFiles/set_union1.gold index 3c33ed9f3..62ebb9521 100644 --- a/SBVTestSuite/GoldFiles/set_union1.gold +++ b/SBVTestSuite/GoldFiles/set_union1.gold @@ -19,14 +19,11 @@ [GOOD] (declare-fun s1 () (Array Int Bool)) ; tracks user variable "b" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s3 () Bool (= s0 s2)) [GOOD] (define-fun s4 () Bool (= s1 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/sort.gold b/SBVTestSuite/GoldFiles/sort.gold index ce15190f3..8ebd9100b 100644 --- a/SBVTestSuite/GoldFiles/sort.gold +++ b/SBVTestSuite/GoldFiles/sort.gold @@ -22,7 +22,6 @@ [GOOD] (declare-fun s2 () Int) ; tracks user variable "c" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -156,8 +155,6 @@ [GOOD] (define-fun s133 () (Seq Int) (seq.++ s8 s132)) [GOOD] (define-fun s134 () Bool (= s104 s133)) [GOOD] (define-fun s135 () Bool (=> s131 s134)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s106) diff --git a/SBVTestSuite/GoldFiles/sumBimapPlus.gold b/SBVTestSuite/GoldFiles/sumBimapPlus.gold index c55178488..8f5cfdae3 100644 --- a/SBVTestSuite/GoldFiles/sumBimapPlus.gold +++ b/SBVTestSuite/GoldFiles/sumBimapPlus.gold @@ -21,7 +21,6 @@ [GOOD] (declare-fun s0 () (SBVEither Int Int)) ; tracks user variable "x" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -40,8 +39,6 @@ [GOOD] (define-fun s14 () Int (ite s8 s1 s5)) [GOOD] (define-fun s15 () Int (+ s2 s14)) [GOOD] (define-fun s16 () Bool (= s13 s15)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s16) diff --git a/SBVTestSuite/GoldFiles/validate_0.gold b/SBVTestSuite/GoldFiles/validate_0.gold index 270a8a5ea..3a329a4a9 100644 --- a/SBVTestSuite/GoldFiles/validate_0.gold +++ b/SBVTestSuite/GoldFiles/validate_0.gold @@ -15,13 +15,10 @@ [ISSUE] (declare-fun s0 () (_ BitVec 8)) ; tracks user variable "x" [ISSUE] ; --- constant tables --- [ISSUE] ; --- non-constant tables --- -[ISSUE] ; --- arrays --- [ISSUE] ; --- uninterpreted constants --- [ISSUE] ; --- user defined functions --- [ISSUE] ; --- assignments --- [ISSUE] (define-fun s2 () Bool (bvult s0 s1)) -[ISSUE] ; --- arrayDelayeds --- -[ISSUE] ; --- arraySetups --- [ISSUE] ; --- delayedEqualities --- [ISSUE] ; --- formula --- [ISSUE] (assert s2) diff --git a/SBVTestSuite/GoldFiles/validate_1.gold b/SBVTestSuite/GoldFiles/validate_1.gold index 62e282e31..d588b1312 100644 --- a/SBVTestSuite/GoldFiles/validate_1.gold +++ b/SBVTestSuite/GoldFiles/validate_1.gold @@ -15,14 +15,11 @@ [GOOD] (declare-fun s0 () (_ FloatingPoint 8 24)) ; tracks user variable "x" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s2 () (_ FloatingPoint 8 24) (fp.add s1 s0 s0)) [GOOD] (define-fun s3 () Bool (fp.eq s0 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/validate_2.gold b/SBVTestSuite/GoldFiles/validate_2.gold index 80d0de7d2..cc6a1b5f8 100644 --- a/SBVTestSuite/GoldFiles/validate_2.gold +++ b/SBVTestSuite/GoldFiles/validate_2.gold @@ -15,14 +15,11 @@ [GOOD] (declare-fun s0 () (_ FloatingPoint 8 24)) ; tracks user variable "x" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s2 () (_ FloatingPoint 8 24) (fp.fma s1 s0 s0 s0)) [GOOD] (define-fun s3 () Bool (fp.eq s0 s2)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s3) diff --git a/SBVTestSuite/GoldFiles/validate_5.gold b/SBVTestSuite/GoldFiles/validate_5.gold index 222fe7e40..84f31da29 100644 --- a/SBVTestSuite/GoldFiles/validate_5.gold +++ b/SBVTestSuite/GoldFiles/validate_5.gold @@ -17,7 +17,6 @@ [GOOD] (declare-fun s1 () Int) ; tracks user variable "y" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -25,8 +24,6 @@ [GOOD] (define-fun s4 () Bool (> s0 s3)) [GOOD] (define-fun s6 () Int (+ s1 s5)) [GOOD] (define-fun s7 () Bool (= s0 s6)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s2) diff --git a/SBVTestSuite/GoldFiles/validate_6.gold b/SBVTestSuite/GoldFiles/validate_6.gold index ebef33cb9..91fec5f7d 100644 --- a/SBVTestSuite/GoldFiles/validate_6.gold +++ b/SBVTestSuite/GoldFiles/validate_6.gold @@ -17,7 +17,6 @@ [GOOD] (declare-fun s1 () Int) ; tracks user variable "y" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- @@ -25,8 +24,6 @@ [GOOD] (define-fun s4 () Bool (> s0 s3)) [GOOD] (define-fun s6 () Int (+ s1 s5)) [GOOD] (define-fun s7 () Bool (= s0 s6)) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s2) diff --git a/SBVTestSuite/GoldFiles/validate_7.gold b/SBVTestSuite/GoldFiles/validate_7.gold index 15f4b1b4a..6a589dfb0 100644 --- a/SBVTestSuite/GoldFiles/validate_7.gold +++ b/SBVTestSuite/GoldFiles/validate_7.gold @@ -14,20 +14,17 @@ [GOOD] (declare-fun s0 () (_ FloatingPoint 8 24)) ; tracks user variable "x" [GOOD] ; --- constant tables --- [GOOD] ; --- non-constant tables --- -[GOOD] ; --- arrays --- [GOOD] ; --- uninterpreted constants --- [GOOD] ; --- user defined functions --- [GOOD] ; --- assignments --- [GOOD] (define-fun s1 () Bool (forall ((l1_s0 (_ FloatingPoint 8 24))) - (let ((l1_s1 (fp.isNaN l1_s0))) - (let ((l1_s2 (fp.isInfinite l1_s0))) - (let ((l1_s3 (or l1_s1 l1_s2))) - (let ((l1_s4 (not l1_s3))) - (let ((l1_s5 (fp.leq s0 l1_s0))) - (let ((l1_s6 (=> l1_s4 l1_s5))) - l1_s6)))))))) -[GOOD] ; --- arrayDelayeds --- -[GOOD] ; --- arraySetups --- + (let ((l1_s1 (fp.isNaN l1_s0))) + (let ((l1_s2 (fp.isInfinite l1_s0))) + (let ((l1_s3 (or l1_s1 l1_s2))) + (let ((l1_s4 (not l1_s3))) + (let ((l1_s5 (fp.leq s0 l1_s0))) + (let ((l1_s6 (=> l1_s4 l1_s5))) + l1_s6)))))))) [GOOD] ; --- delayedEqualities --- [GOOD] ; --- formula --- [GOOD] (assert s1)