diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2014-08-18 15:41:46 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2014-08-18 15:52:55 -0400 |
| commit | d5e67f7263cd0d44e6f15a64940431f385ef873b (patch) | |
| tree | 0bc175c7cd9381cb9ed5c7e2cfadc6d55760e696 | |
| parent | cea6844c6acda98d38cdc897c5fa1a78edddc7a2 (diff) | |
Revert a8e0ce67 and add test case (resolves bug #578).
This reverts commit a8e0ce673ba00533a663804cf74500e4d9a3a5cb.
| -rw-r--r-- | src/parser/smt2/Smt2.g | 2 | ||||
| -rw-r--r-- | test/regress/regress0/Makefile.am | 3 | ||||
| -rw-r--r-- | test/regress/regress0/bug578.smt2 | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/parser/smt2/Smt2.g b/src/parser/smt2/Smt2.g index d512437af..085cc11c8 100644 --- a/src/parser/smt2/Smt2.g +++ b/src/parser/smt2/Smt2.g @@ -1206,7 +1206,7 @@ indexedFunctionName[CVC4::Expr& op] ( 'extract' n1=INTEGER_LITERAL n2=INTEGER_LITERAL { op = MK_CONST(BitVectorExtract(AntlrInput::tokenToUnsigned($n1), AntlrInput::tokenToUnsigned($n2))); } - | ('repeat' INTEGER_LITERAL)=>'repeat' n=INTEGER_LITERAL + | 'repeat' n=INTEGER_LITERAL { op = MK_CONST(BitVectorRepeat(AntlrInput::tokenToUnsigned($n))); } | 'zero_extend' n=INTEGER_LITERAL { op = MK_CONST(BitVectorZeroExtend(AntlrInput::tokenToUnsigned($n))); } diff --git a/test/regress/regress0/Makefile.am b/test/regress/regress0/Makefile.am index 55a588362..5e57e9b67 100644 --- a/test/regress/regress0/Makefile.am +++ b/test/regress/regress0/Makefile.am @@ -162,7 +162,8 @@ BUG_TESTS = \ bug548a.smt2 \ bug567.smt2 \ bug576.smt2 \ - bug576a.smt2 + bug576a.smt2 \ + bug578.smt2 TESTS = $(SMT_TESTS) $(SMT2_TESTS) $(CVC_TESTS) $(TPTP_TESTS) $(BUG_TESTS) diff --git a/test/regress/regress0/bug578.smt2 b/test/regress/regress0/bug578.smt2 new file mode 100644 index 000000000..a4d53f8bf --- /dev/null +++ b/test/regress/regress0/bug578.smt2 @@ -0,0 +1,7 @@ +(set-info :smt-lib-version 2.0) +(set-info :status sat) +(set-logic QF_BV) +(declare-fun v0 () (_ BitVec 1)) +(declare-fun v1 () (_ BitVec 10)) +(assert (= v1 ((_ repeat 10) v0))) +(check-sat) |