From 56a523d9c4dd04cedbd812570cd80e3bc94cce4c Mon Sep 17 00:00:00 2001 From: ajreynol Date: Fri, 7 Nov 2014 11:37:43 +0100 Subject: Properly distinguish which EQC to assign values in datatypes, use assertRepresentative. Disable regression related to records. Enable fmf-fun related regression (modified). Apply modified version of Morgan's patch to fix tuples/records in model. Fix bug with sort inference + patterns. Minor infrastructure. --- test/regress/regress0/fmf/Makefile.am | 5 ++--- test/regress/regress0/fmf/lst-no-self-rev-exp.smt2 | 6 +++++- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'test/regress/regress0/fmf') diff --git a/test/regress/regress0/fmf/Makefile.am b/test/regress/regress0/fmf/Makefile.am index e3e514496..ca3907b0b 100644 --- a/test/regress/regress0/fmf/Makefile.am +++ b/test/regress/regress0/fmf/Makefile.am @@ -35,12 +35,11 @@ TESTS = \ fc-unsat-pent.smt2 \ fc-pigeonhole19.smt2 \ Hoare-z3.931718.smt \ - bug0909.smt2 + bug0909.smt2 \ + lst-no-self-rev-exp.smt2 EXTRA_DIST = $(TESTS) -# disabled for now : -# lst-no-self-rev-exp.smt2 #if CVC4_BUILD_PROFILE_COMPETITION #else diff --git a/test/regress/regress0/fmf/lst-no-self-rev-exp.smt2 b/test/regress/regress0/fmf/lst-no-self-rev-exp.smt2 index e86d8c60e..5e1f3de30 100644 --- a/test/regress/regress0/fmf/lst-no-self-rev-exp.smt2 +++ b/test/regress/regress0/fmf/lst-no-self-rev-exp.smt2 @@ -1,4 +1,4 @@ -; COMMAND-LINE: --finite-model-find --uf-ss-fair +; COMMAND-LINE: --finite-model-find --dt-rewrite-error-sel ; EXPECT: sat (set-logic ALL_SUPPORTED) (declare-datatypes () ((Nat (succ (pred Nat)) (zero)) (Lst (cons (hd Nat) (tl Lst)) (nil)))) @@ -9,6 +9,10 @@ (declare-sort I_app 0) (declare-sort I_rev 0) +(declare-fun a () I_app) +(declare-fun b () I_app) +(assert (not (= a b))) + (declare-fun app_0_3 (I_app) Lst) (declare-fun app_1_4 (I_app) Lst) (declare-fun rev_0_5 (I_rev) Lst) -- cgit v1.2.3