summaryrefslogtreecommitdiff
path: root/test/regress/regress1/strings
diff options
context:
space:
mode:
Diffstat (limited to 'test/regress/regress1/strings')
-rw-r--r--test/regress/regress1/strings/artemis-0512-nonterm.smt24
-rw-r--r--test/regress/regress1/strings/bug615.smt28
-rw-r--r--test/regress/regress1/strings/bug799-min.smt24
-rw-r--r--test/regress/regress1/strings/code-sequence.smt26
-rw-r--r--test/regress/regress1/strings/complement-test.smt26
-rw-r--r--test/regress/regress1/strings/fmf001.smt210
-rw-r--r--test/regress/regress1/strings/fmf002.smt24
-rw-r--r--test/regress/regress1/strings/issue1684-regex.smt22
-rw-r--r--test/regress/regress1/strings/issue2060.smt24
-rw-r--r--test/regress/regress1/strings/issue2429-code.smt22
-rw-r--r--test/regress/regress1/strings/issue2981.smt24
-rw-r--r--test/regress/regress1/strings/issue2982.smt26
-rw-r--r--test/regress/regress1/strings/issue3090.smt22
-rw-r--r--test/regress/regress1/strings/issue3272.smt23
-rw-r--r--test/regress/regress1/strings/issue3357.smt26
-rw-r--r--test/regress/regress1/strings/kaluza-fl.smt222
-rw-r--r--test/regress/regress1/strings/no-lazy-pp-quant.smt24
-rw-r--r--test/regress/regress1/strings/non_termination_regular_expression4.smt26
-rw-r--r--test/regress/regress1/strings/norn-13.smt28
-rw-r--r--test/regress/regress1/strings/norn-360.smt212
-rw-r--r--test/regress/regress1/strings/norn-ab.smt212
-rw-r--r--test/regress/regress1/strings/norn-nel-bug-052116.smt210
-rw-r--r--test/regress/regress1/strings/norn-simp-rew-sat.smt212
-rw-r--r--test/regress/regress1/strings/nt6-dd.smt26
-rw-r--r--test/regress/regress1/strings/nterm-re-inter-sigma.smt24
-rw-r--r--test/regress/regress1/strings/pierre150331.smt21
-rw-r--r--test/regress/regress1/strings/policy_variable.smt22
-rw-r--r--test/regress/regress1/strings/query4674.smt22
-rw-r--r--test/regress/regress1/strings/query8485.smt22
-rw-r--r--test/regress/regress1/strings/re-agg-total1.smt26
-rw-r--r--test/regress/regress1/strings/re-agg-total2.smt24
-rw-r--r--test/regress/regress1/strings/re-all-char-hard.smt24
-rw-r--r--test/regress/regress1/strings/re-elim-exact.smt24
-rw-r--r--test/regress/regress1/strings/re-mod-eq.smt28
-rw-r--r--test/regress/regress1/strings/re-neg-concat-reduct.smt26
-rw-r--r--test/regress/regress1/strings/re-neg-unfold-rev-a.smt26
-rw-r--r--test/regress/regress1/strings/re-unsound-080718.smt210
-rw-r--r--test/regress/regress1/strings/regexp-strat-fix.smt26
-rw-r--r--test/regress/regress1/strings/regexp001.smt26
-rw-r--r--test/regress/regress1/strings/regexp002.smt210
-rw-r--r--test/regress/regress1/strings/regexp003.smt210
-rw-r--r--test/regress/regress1/strings/reloop.smt210
-rw-r--r--test/regress/regress1/strings/replaceall-len.smt24
-rw-r--r--test/regress/regress1/strings/replaceall-replace.smt24
-rw-r--r--test/regress/regress1/strings/rew-check1.smt26
-rw-r--r--test/regress/regress1/strings/simple-re-consume.smt24
-rw-r--r--test/regress/regress1/strings/stoi-400million.smt24
-rw-r--r--test/regress/regress1/strings/stoi-solve.smt22
-rw-r--r--test/regress/regress1/strings/str-code-sat.smt216
-rw-r--r--test/regress/regress1/strings/str-code-unsat-2.smt22
-rw-r--r--test/regress/regress1/strings/str-code-unsat-3.smt216
-rw-r--r--test/regress/regress1/strings/str-code-unsat.smt216
-rw-r--r--test/regress/regress1/strings/string-unsound-sem.smt24
-rw-r--r--test/regress/regress1/strings/type002.smt24
-rw-r--r--test/regress/regress1/strings/type003.smt24
-rw-r--r--test/regress/regress1/strings/username_checker_min.smt24
56 files changed, 177 insertions, 177 deletions
diff --git a/test/regress/regress1/strings/artemis-0512-nonterm.smt2 b/test/regress/regress1/strings/artemis-0512-nonterm.smt2
index 328317ea4..1d76f3ca0 100644
--- a/test/regress/regress1/strings/artemis-0512-nonterm.smt2
+++ b/test/regress/regress1/strings/artemis-0512-nonterm.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_SLIA)
(set-option :strings-exp true)
(set-info :status unsat)
@@ -21,7 +21,7 @@
)
)
-(assert (= (<= (str.to.int Y) 31) false))
+(assert (= (<= (str.to_int Y) 31) false))
(check-sat)
diff --git a/test/regress/regress1/strings/bug615.smt2 b/test/regress/regress1/strings/bug615.smt2
index 673b0dbd0..3098a59ba 100644
--- a/test/regress/regress1/strings/bug615.smt2
+++ b/test/regress/regress1/strings/bug615.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_S)
(set-option :strings-exp true)
(set-info :status sat)
@@ -11,16 +11,16 @@
(assert (str.contains joined "<script>alert(1);</script>"))
; (<script>[^<]*</script>)+
-(assert (str.in.re joined
+(assert (str.in_re joined
(re.+ (re.++
- (str.to.re "<script>")
+ (str.to_re "<script>")
(re.*
(re.union
(re.range " " ";")
(re.range "=" "~")
)
)
- (str.to.re "</script>")
+ (str.to_re "</script>")
))
))
diff --git a/test/regress/regress1/strings/bug799-min.smt2 b/test/regress/regress1/strings/bug799-min.smt2
index 0cd15af4e..d6054925d 100644
--- a/test/regress/regress1/strings/bug799-min.smt2
+++ b/test/regress/regress1/strings/bug799-min.smt2
@@ -1,6 +1,6 @@
; COMMAND-LINE: --incremental --strings-exp
; EXPECT: sat
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic ALL)
(set-info :status sat)
@@ -14,6 +14,6 @@
(assert (= (str.at u 8) "6"))
(push 1)
-(assert (str.in.re s (re.range "0" "3")))
+(assert (str.in_re s (re.range "0" "3")))
(check-sat)
diff --git a/test/regress/regress1/strings/code-sequence.smt2 b/test/regress/regress1/strings/code-sequence.smt2
index 2654017d4..e378f9850 100644
--- a/test/regress/regress1/strings/code-sequence.smt2
+++ b/test/regress/regress1/strings/code-sequence.smt2
@@ -6,9 +6,9 @@
(declare-fun x () String)
(assert (forall ((n Int)) (=> (and (<= 0 n) (< n (str.len x)))
(and
-(<= 60 (str.code (str.at x n)))
-(<= (str.code (str.at x n)) 90)
-(< (+ 1 (str.code (str.at x (- n 1)))) (str.code (str.at x n)))
+(<= 60 (str.to_code (str.at x n)))
+(<= (str.to_code (str.at x n)) 90)
+(< (+ 1 (str.to_code (str.at x (- n 1)))) (str.to_code (str.at x n)))
))))
(assert (> (str.len x) 3))
(check-sat)
diff --git a/test/regress/regress1/strings/complement-test.smt2 b/test/regress/regress1/strings/complement-test.smt2
index 1fcbdc2c3..5d3c8310f 100644
--- a/test/regress/regress1/strings/complement-test.smt2
+++ b/test/regress/regress1/strings/complement-test.smt2
@@ -5,8 +5,8 @@
(declare-fun z () String)
(assert (= x (str.++ "AB" y)))
(assert (or (= y "C") (= y (str.++ "D" z)) (= (str.len y) 10)))
-(assert (str.in.re x
+(assert (str.in_re x
(re.inter
- (re.comp (str.to.re "AB"))
- (re.comp (re.++ (str.to.re "AB") (re.range "A" "E") (re.* re.allchar))))))
+ (re.comp (str.to_re "AB"))
+ (re.comp (re.++ (str.to_re "AB") (re.range "A" "E") (re.* re.allchar))))))
(check-sat)
diff --git a/test/regress/regress1/strings/fmf001.smt2 b/test/regress/regress1/strings/fmf001.smt2
index 71ae63e87..4c6b2091b 100644
--- a/test/regress/regress1/strings/fmf001.smt2
+++ b/test/regress/regress1/strings/fmf001.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_S)
(set-option :strings-exp true)
(set-option :strings-fmf true)
@@ -7,12 +7,12 @@
(declare-fun x () String)
(declare-fun y () String)
-(assert (str.in.re x
- (re.* (re.++ (re.* (str.to.re "a") ) (str.to.re "b") ))
+(assert (str.in_re x
+ (re.* (re.++ (re.* (str.to_re "a") ) (str.to_re "b") ))
))
-(assert (str.in.re y
- (re.* (re.++ (re.* (str.to.re "a") ) (str.to.re "b") ))
+(assert (str.in_re y
+ (re.* (re.++ (re.* (str.to_re "a") ) (str.to_re "b") ))
))
(assert (not (= x y)))
diff --git a/test/regress/regress1/strings/fmf002.smt2 b/test/regress/regress1/strings/fmf002.smt2
index 2f2209ae7..8daaa6ee4 100644
--- a/test/regress/regress1/strings/fmf002.smt2
+++ b/test/regress/regress1/strings/fmf002.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_SLIA)
(set-option :strings-exp true)
(set-option :strings-fmf true)
@@ -8,7 +8,7 @@
(declare-fun y () String)
(declare-fun z () String)
-(assert (str.in.re x
+(assert (str.in_re x
(re.+ (re.range "a" "c"))
))
diff --git a/test/regress/regress1/strings/issue1684-regex.smt2 b/test/regress/regress1/strings/issue1684-regex.smt2
index 35eb8456d..de0739bd8 100644
--- a/test/regress/regress1/strings/issue1684-regex.smt2
+++ b/test/regress/regress1/strings/issue1684-regex.smt2
@@ -5,4 +5,4 @@
(declare-const s String)
(assert (str.in.re s (re.* (re.range "\x00" "\xFF"))))
(assert (str.in.re s (re.range "\x00" "\xFF")))
-(check-sat) \ No newline at end of file
+(check-sat)
diff --git a/test/regress/regress1/strings/issue2060.smt2 b/test/regress/regress1/strings/issue2060.smt2
index 784fe1862..ade68a6a1 100644
--- a/test/regress/regress1/strings/issue2060.smt2
+++ b/test/regress/regress1/strings/issue2060.smt2
@@ -4,8 +4,8 @@
(declare-const action String)
(declare-const example_key String)
-(assert (str.in.re action (re.++
- (str.to.re "foobar:ab")
+(assert (str.in_re action (re.++
+ (str.to_re "foobar:ab")
(re.* re.allchar)
)))
diff --git a/test/regress/regress1/strings/issue2429-code.smt2 b/test/regress/regress1/strings/issue2429-code.smt2
index 9dc29794e..ea564dc48 100644
--- a/test/regress/regress1/strings/issue2429-code.smt2
+++ b/test/regress/regress1/strings/issue2429-code.smt2
@@ -3,7 +3,7 @@
(set-option :produce-models true)
(set-info :status sat)
-(define-fun byte_2_int ((s String)) Int (ite (= (str.len s) 1) (str.code s) 256))
+(define-fun byte_2_int ((s String)) Int (ite (= (str.len s) 1) (str.to_code s) 256))
(define-fun read_buffer16 ((s1 String) (s2 String)) Int
(+ (* 256 (byte_2_int s1))
diff --git a/test/regress/regress1/strings/issue2981.smt2 b/test/regress/regress1/strings/issue2981.smt2
index 78cdb2a8c..615140fc9 100644
--- a/test/regress/regress1/strings/issue2981.smt2
+++ b/test/regress/regress1/strings/issue2981.smt2
@@ -6,8 +6,8 @@
(declare-const y String)
(declare-const m String)
(declare-const n String)
-(assert (str.in.re x (re.+ (re.range "0" "9"))))
-(assert (= 0 (str.to.int x)))
+(assert (str.in_re x (re.+ (re.range "0" "9"))))
+(assert (= 0 (str.to_int x)))
(assert (not (= x "")))
(assert (not (= x "0")))
(assert (not (= x "3")))
diff --git a/test/regress/regress1/strings/issue2982.smt2 b/test/regress/regress1/strings/issue2982.smt2
index 41be8d1fd..a57915b44 100644
--- a/test/regress/regress1/strings/issue2982.smt2
+++ b/test/regress/regress1/strings/issue2982.smt2
@@ -16,8 +16,8 @@
(declare-fun var_11 () String)
(declare-fun var_12 () String)
-(assert (str.in.re (str.++ var_7 "z" var_7 ) (re.* (str.to.re "z"))))
-(assert (str.in.re var_7 (re.* (re.range "a" "u"))))
-(assert (not (str.in.re (str.++ "a" var_7 "z" "a" var_7 ) (re.++ (re.* (re.union (str.to.re "z") (re.++ (str.to.re "a") (re.++ (re.* (str.to.re "a")) (str.to.re "z"))))) (re.++ (str.to.re "a") (re.* (str.to.re "a")))))))
+(assert (str.in_re (str.++ var_7 "z" var_7 ) (re.* (str.to_re "z"))))
+(assert (str.in_re var_7 (re.* (re.range "a" "u"))))
+(assert (not (str.in_re (str.++ "a" var_7 "z" "a" var_7 ) (re.++ (re.* (re.union (str.to_re "z") (re.++ (str.to_re "a") (re.++ (re.* (str.to_re "a")) (str.to_re "z"))))) (re.++ (str.to_re "a") (re.* (str.to_re "a")))))))
(assert (and (<= (str.len var_7) 0 ) (<= 0 (str.len var_7))))
(check-sat)
diff --git a/test/regress/regress1/strings/issue3090.smt2 b/test/regress/regress1/strings/issue3090.smt2
index 734257a25..dc04289d6 100644
--- a/test/regress/regress1/strings/issue3090.smt2
+++ b/test/regress/regress1/strings/issue3090.smt2
@@ -2,5 +2,5 @@
(set-option :strings-exp true)
(set-info :status unsat)
(declare-const id String)
-(assert (and (str.in.re id (re.+ (re.range "0" "9"))) (str.contains id "value")))
+(assert (and (str.in_re id (re.+ (re.range "0" "9"))) (str.contains id "value")))
(check-sat)
diff --git a/test/regress/regress1/strings/issue3272.smt2 b/test/regress/regress1/strings/issue3272.smt2
index 47759ef1e..cf33afb92 100644
--- a/test/regress/regress1/strings/issue3272.smt2
+++ b/test/regress/regress1/strings/issue3272.smt2
@@ -1,3 +1,4 @@
+(set-info :smt-lib-version 2.5)
(set-logic ALL_SUPPORTED)
(set-option :strings-exp true)
(set-info :status sat)
@@ -10,7 +11,7 @@
(and
(not (= (ite (= (str.at (str.substr c 1 (- (str.len (str.substr c 0 (- (str.len c) 1))) 1)) (- (str.len (str.substr (str.substr c 1 (- (str.len (str.replace a b "")) 1)) 0 (- (str.len (str.substr (str.replace a b "") 1 (- (str.len (str.replace a b "")) 1))) 1))) 1)) "\t") 1 0) 0))
- (= (ite (= (str.at (str.substr (str.substr c 1 (- (str.len (str.replace a b "")) 1)) 0 (- (str.len (str.substr (str.replace a b "") 1 (- (str.len (str.replace a b "")) 1))) 1)) 0) "\n") 1 0) 0)
+ (= (ite (= (str.at (str.substr (str.substr c 1 (- (str.len (str.replace a b "")) 1)) 0 (- (str.len (str.substr (str.replace a b "") 1 (- (str.len (str.replace a b "")) 1))) 1)) 0) "B") 1 0) 0)
)
(= (ite (= (str.at (str.substr (str.substr c 1 (- (str.len c) 1)) 0 (- (str.len (str.substr (str.replace a b "") 1 (- (str.len (str.replace a b "")) 1))) 1)) 0) " ") 1 0) 0)
diff --git a/test/regress/regress1/strings/issue3357.smt2 b/test/regress/regress1/strings/issue3357.smt2
index d0e436038..6951d47e1 100644
--- a/test/regress/regress1/strings/issue3357.smt2
+++ b/test/regress/regress1/strings/issue3357.smt2
@@ -9,10 +9,10 @@
(declare-const e String)
(declare-const f String)
(assert (or
- (and (= d (str.++ e g)) (str.in.re e (re.* (str.to.re "HG4"))) (> 0 (str.to.int g)) (= 1 (str.len e)) (= 2 (str.len (str.substr b 0 (str.len d)))))
+ (and (= d (str.++ e g)) (str.in_re e (re.* (str.to_re "HG4"))) (> 0 (str.to_int g)) (= 1 (str.len e)) (= 2 (str.len (str.substr b 0 (str.len d)))))
(and
- (str.in.re (str.replace (str.replace a c "") "T" "") (re.* (re.union (str.to.re "a") (str.to.re ""))))
- (= 0 (str.to.int (str.replace (str.replace a c "") "T" "")))))
+ (str.in_re (str.replace (str.replace a c "") "T" "") (re.* (re.union (str.to_re "a") (str.to_re ""))))
+ (= 0 (str.to_int (str.replace (str.replace a c "") "T" "")))))
)
(assert (= b (str.++ d f)))
(check-sat)
diff --git a/test/regress/regress1/strings/kaluza-fl.smt2 b/test/regress/regress1/strings/kaluza-fl.smt2
index d277d85e6..27065916f 100644
--- a/test/regress/regress1/strings/kaluza-fl.smt2
+++ b/test/regress/regress1/strings/kaluza-fl.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_SLIA)
(set-info :status sat)
@@ -60,16 +60,16 @@
(assert (= T_SELECT_1 (not (= PCTEMP_LHS_1 (- 1)))))
(assert (ite T_SELECT_1
- (and (= PCTEMP_LHS_1 (+ I0_2 0))(= var_0xINPUT_12454 (str.++ T0_2 T1_2))(= I0_2 (str.len T4_2))(= 0 (str.len T0_2))(= T1_2 (str.++ T2_2 T3_2))(= T2_2 (str.++ T4_2 T5_2))(= T5_2 "__utma=169413169.")(not (str.in.re T4_2 (re.++ (str.to.re "_") (str.to.re "_") (str.to.re "u") (str.to.re "t") (str.to.re "m") (str.to.re "a") (str.to.re "=") (str.to.re "1") (str.to.re "6") (str.to.re "9") (str.to.re "4") (str.to.re "1") (str.to.re "3") (str.to.re "1") (str.to.re "6") (str.to.re "9") (str.to.re ".")))))
- (and (= PCTEMP_LHS_1 (- 1))(= var_0xINPUT_12454 (str.++ T0_2 T1_2))(= 0 (str.len T0_2))(not (str.in.re T1_2 (re.++ (str.to.re "_") (str.to.re "_") (str.to.re "u") (str.to.re "t") (str.to.re "m") (str.to.re "a") (str.to.re "=") (str.to.re "1") (str.to.re "6") (str.to.re "9") (str.to.re "4") (str.to.re "1") (str.to.re "3") (str.to.re "1") (str.to.re "6") (str.to.re "9") (str.to.re ".")))))))
+ (and (= PCTEMP_LHS_1 (+ I0_2 0))(= var_0xINPUT_12454 (str.++ T0_2 T1_2))(= I0_2 (str.len T4_2))(= 0 (str.len T0_2))(= T1_2 (str.++ T2_2 T3_2))(= T2_2 (str.++ T4_2 T5_2))(= T5_2 "__utma=169413169.")(not (str.in_re T4_2 (re.++ (str.to_re "_") (str.to_re "_") (str.to_re "u") (str.to_re "t") (str.to_re "m") (str.to_re "a") (str.to_re "=") (str.to_re "1") (str.to_re "6") (str.to_re "9") (str.to_re "4") (str.to_re "1") (str.to_re "3") (str.to_re "1") (str.to_re "6") (str.to_re "9") (str.to_re ".")))))
+ (and (= PCTEMP_LHS_1 (- 1))(= var_0xINPUT_12454 (str.++ T0_2 T1_2))(= 0 (str.len T0_2))(not (str.in_re T1_2 (re.++ (str.to_re "_") (str.to_re "_") (str.to_re "u") (str.to_re "t") (str.to_re "m") (str.to_re "a") (str.to_re "=") (str.to_re "1") (str.to_re "6") (str.to_re "9") (str.to_re "4") (str.to_re "1") (str.to_re "3") (str.to_re "1") (str.to_re "6") (str.to_re "9") (str.to_re ".")))))))
(assert (= T_SELECT_2 (not (= PCTEMP_LHS_2 (- 1)))))
(assert (ite T_SELECT_2
- (and (= PCTEMP_LHS_2 (+ I0_4 0))(= var_0xINPUT_12454 (str.++ T0_4 T1_4))(= I0_4 (str.len T4_4))(= 0 (str.len T0_4))(= T1_4 (str.++ T2_4 T3_4))(= T2_4 (str.++ T4_4 T5_4))(= T5_4 "__utmb=169413169")(not (str.in.re T4_4 (re.++ (str.to.re "_") (str.to.re "_") (str.to.re "u") (str.to.re "t") (str.to.re "m") (str.to.re "b") (str.to.re "=") (str.to.re "1") (str.to.re "6") (str.to.re "9") (str.to.re "4") (str.to.re "1") (str.to.re "3") (str.to.re "1") (str.to.re "6") (str.to.re "9")))))
- (and (= PCTEMP_LHS_2 (- 1))(= var_0xINPUT_12454 (str.++ T0_4 T1_4))(= 0 (str.len T0_4))(not (str.in.re T1_4 (re.++ (str.to.re "_") (str.to.re "_") (str.to.re "u") (str.to.re "t") (str.to.re "m") (str.to.re "b") (str.to.re "=") (str.to.re "1") (str.to.re "6") (str.to.re "9") (str.to.re "4") (str.to.re "1") (str.to.re "3") (str.to.re "1") (str.to.re "6") (str.to.re "9")))))))
+ (and (= PCTEMP_LHS_2 (+ I0_4 0))(= var_0xINPUT_12454 (str.++ T0_4 T1_4))(= I0_4 (str.len T4_4))(= 0 (str.len T0_4))(= T1_4 (str.++ T2_4 T3_4))(= T2_4 (str.++ T4_4 T5_4))(= T5_4 "__utmb=169413169")(not (str.in_re T4_4 (re.++ (str.to_re "_") (str.to_re "_") (str.to_re "u") (str.to_re "t") (str.to_re "m") (str.to_re "b") (str.to_re "=") (str.to_re "1") (str.to_re "6") (str.to_re "9") (str.to_re "4") (str.to_re "1") (str.to_re "3") (str.to_re "1") (str.to_re "6") (str.to_re "9")))))
+ (and (= PCTEMP_LHS_2 (- 1))(= var_0xINPUT_12454 (str.++ T0_4 T1_4))(= 0 (str.len T0_4))(not (str.in_re T1_4 (re.++ (str.to_re "_") (str.to_re "_") (str.to_re "u") (str.to_re "t") (str.to_re "m") (str.to_re "b") (str.to_re "=") (str.to_re "1") (str.to_re "6") (str.to_re "9") (str.to_re "4") (str.to_re "1") (str.to_re "3") (str.to_re "1") (str.to_re "6") (str.to_re "9")))))))
(assert (= T_SELECT_3 (not (= PCTEMP_LHS_3 (- 1)))))
(assert (ite T_SELECT_3
- (and (= PCTEMP_LHS_3 (+ I0_6 0))(= var_0xINPUT_12454 (str.++ T0_6 T1_6))(= I0_6 (str.len T4_6))(= 0 (str.len T0_6))(= T1_6 (str.++ T2_6 T3_6))(= T2_6 (str.++ T4_6 T5_6))(= T5_6 "__utmc=169413169")(not (str.in.re T4_6 (re.++ (str.to.re "_") (str.to.re "_") (str.to.re "u") (str.to.re "t") (str.to.re "m") (str.to.re "c") (str.to.re "=") (str.to.re "1") (str.to.re "6") (str.to.re "9") (str.to.re "4") (str.to.re "1") (str.to.re "3") (str.to.re "1") (str.to.re "6") (str.to.re "9")))))
- (and (= PCTEMP_LHS_3 (- 1))(= var_0xINPUT_12454 (str.++ T0_6 T1_6))(= 0 (str.len T0_6))(not (str.in.re T1_6 (re.++ (str.to.re "_") (str.to.re "_") (str.to.re "u") (str.to.re "t") (str.to.re "m") (str.to.re "c") (str.to.re "=") (str.to.re "1") (str.to.re "6") (str.to.re "9") (str.to.re "4") (str.to.re "1") (str.to.re "3") (str.to.re "1") (str.to.re "6") (str.to.re "9")))))))
+ (and (= PCTEMP_LHS_3 (+ I0_6 0))(= var_0xINPUT_12454 (str.++ T0_6 T1_6))(= I0_6 (str.len T4_6))(= 0 (str.len T0_6))(= T1_6 (str.++ T2_6 T3_6))(= T2_6 (str.++ T4_6 T5_6))(= T5_6 "__utmc=169413169")(not (str.in_re T4_6 (re.++ (str.to_re "_") (str.to_re "_") (str.to_re "u") (str.to_re "t") (str.to_re "m") (str.to_re "c") (str.to_re "=") (str.to_re "1") (str.to_re "6") (str.to_re "9") (str.to_re "4") (str.to_re "1") (str.to_re "3") (str.to_re "1") (str.to_re "6") (str.to_re "9")))))
+ (and (= PCTEMP_LHS_3 (- 1))(= var_0xINPUT_12454 (str.++ T0_6 T1_6))(= 0 (str.len T0_6))(not (str.in_re T1_6 (re.++ (str.to_re "_") (str.to_re "_") (str.to_re "u") (str.to_re "t") (str.to_re "m") (str.to_re "c") (str.to_re "=") (str.to_re "1") (str.to_re "6") (str.to_re "9") (str.to_re "4") (str.to_re "1") (str.to_re "3") (str.to_re "1") (str.to_re "6") (str.to_re "9")))))))
(assert (= T_4 (<= 0 PCTEMP_LHS_1)))
(assert T_4)
(assert (= T_5 (<= 0 PCTEMP_LHS_2)))
@@ -84,14 +84,14 @@
(assert T_a)
(assert (= T_SELECT_4 (not (= PCTEMP_LHS_4 (- 1)))))
(assert (ite T_SELECT_4
- (and (= PCTEMP_LHS_4 (+ I0_15 0))(= var_0xINPUT_12454 (str.++ T0_15 T1_15))(= I0_15 (str.len T4_15))(= 0 (str.len T0_15))(= T1_15 (str.++ T2_15 T3_15))(= T2_15 (str.++ T4_15 T5_15))(= T5_15 "__utmb=169413169")(not (str.in.re T4_15 (re.++ (str.to.re "_") (str.to.re "_") (str.to.re "u") (str.to.re "t") (str.to.re "m") (str.to.re "b") (str.to.re "=") (str.to.re "1") (str.to.re "6") (str.to.re "9") (str.to.re "4") (str.to.re "1") (str.to.re "3") (str.to.re "1") (str.to.re "6") (str.to.re "9")))))
- (and (= PCTEMP_LHS_4 (- 1))(= var_0xINPUT_12454 (str.++ T0_15 T1_15))(= 0 (str.len T0_15))(not (str.in.re T1_15 (re.++ (str.to.re "_") (str.to.re "_") (str.to.re "u") (str.to.re "t") (str.to.re "m") (str.to.re "b") (str.to.re "=") (str.to.re "1") (str.to.re "6") (str.to.re "9") (str.to.re "4") (str.to.re "1") (str.to.re "3") (str.to.re "1") (str.to.re "6") (str.to.re "9")))))))
+ (and (= PCTEMP_LHS_4 (+ I0_15 0))(= var_0xINPUT_12454 (str.++ T0_15 T1_15))(= I0_15 (str.len T4_15))(= 0 (str.len T0_15))(= T1_15 (str.++ T2_15 T3_15))(= T2_15 (str.++ T4_15 T5_15))(= T5_15 "__utmb=169413169")(not (str.in_re T4_15 (re.++ (str.to_re "_") (str.to_re "_") (str.to_re "u") (str.to_re "t") (str.to_re "m") (str.to_re "b") (str.to_re "=") (str.to_re "1") (str.to_re "6") (str.to_re "9") (str.to_re "4") (str.to_re "1") (str.to_re "3") (str.to_re "1") (str.to_re "6") (str.to_re "9")))))
+ (and (= PCTEMP_LHS_4 (- 1))(= var_0xINPUT_12454 (str.++ T0_15 T1_15))(= 0 (str.len T0_15))(not (str.in_re T1_15 (re.++ (str.to_re "_") (str.to_re "_") (str.to_re "u") (str.to_re "t") (str.to_re "m") (str.to_re "b") (str.to_re "=") (str.to_re "1") (str.to_re "6") (str.to_re "9") (str.to_re "4") (str.to_re "1") (str.to_re "3") (str.to_re "1") (str.to_re "6") (str.to_re "9")))))))
(assert (= T_c (< (- 1) PCTEMP_LHS_4)))
(assert T_c)
(assert (= T_SELECT_5 (not (= PCTEMP_LHS_5 (- 1)))))
(assert (ite T_SELECT_5
- (and (= PCTEMP_LHS_5 (+ I0_18 PCTEMP_LHS_4))(= var_0xINPUT_12454 (str.++ T0_18 T1_18))(= I0_18 (str.len T4_18))(= PCTEMP_LHS_4 (str.len T0_18))(= T1_18 (str.++ T2_18 T3_18))(= T2_18 (str.++ T4_18 T5_18))(= T5_18 ";")(not (str.in.re T4_18 (str.to.re ";"))))
- (and (= PCTEMP_LHS_5 (- 1))(= var_0xINPUT_12454 (str.++ T0_18 T1_18))(= PCTEMP_LHS_4 (str.len T0_18))(not (str.in.re T1_18 (str.to.re ";"))))))
+ (and (= PCTEMP_LHS_5 (+ I0_18 PCTEMP_LHS_4))(= var_0xINPUT_12454 (str.++ T0_18 T1_18))(= I0_18 (str.len T4_18))(= PCTEMP_LHS_4 (str.len T0_18))(= T1_18 (str.++ T2_18 T3_18))(= T2_18 (str.++ T4_18 T5_18))(= T5_18 ";")(not (str.in_re T4_18 (str.to_re ";"))))
+ (and (= PCTEMP_LHS_5 (- 1))(= var_0xINPUT_12454 (str.++ T0_18 T1_18))(= PCTEMP_LHS_4 (str.len T0_18))(not (str.in_re T1_18 (str.to_re ";"))))))
(assert (= T_e (< PCTEMP_LHS_5 0)))
(assert T_e)
diff --git a/test/regress/regress1/strings/no-lazy-pp-quant.smt2 b/test/regress/regress1/strings/no-lazy-pp-quant.smt2
index 672c4e5fc..60f7e575e 100644
--- a/test/regress/regress1/strings/no-lazy-pp-quant.smt2
+++ b/test/regress/regress1/strings/no-lazy-pp-quant.smt2
@@ -1,9 +1,9 @@
; COMMAND-LINE: --strings-exp --no-strings-lazy-pp
; EXPECT: sat
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic ALL)
(set-info :status sat)
(declare-fun result () Int)
(declare-fun s () String)
-(assert (! (not (= (str.to.int s) result)) :named a0))
+(assert (! (not (= (str.to_int s) result)) :named a0))
(check-sat)
diff --git a/test/regress/regress1/strings/non_termination_regular_expression4.smt2 b/test/regress/regress1/strings/non_termination_regular_expression4.smt2
index 0b527345d..1e3f3cb96 100644
--- a/test/regress/regress1/strings/non_termination_regular_expression4.smt2
+++ b/test/regress/regress1/strings/non_termination_regular_expression4.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic ALL)
(set-info :status unsat)
(set-option :strings-exp true)
@@ -8,7 +8,7 @@
; Action: p0.0
(declare-const p0.0.action Bool)
-(assert (= p0.0.action (and (= actionNamespace "foobar") (str.in.re actionName (re.++ (str.to.re "foo") (re.* re.allchar) (re.++ (str.to.re "") re.allchar (str.to.re "bar")))))))
+(assert (= p0.0.action (and (= actionNamespace "foobar") (str.in_re actionName (re.++ (str.to_re "foo") (re.* re.allchar) (re.++ (str.to_re "") re.allchar (str.to_re "bar")))))))
; Policy: 0
(declare-const p0.denies Bool)
@@ -20,7 +20,7 @@
; Action: p1.0
(declare-const p1.0.action Bool)
-(assert (= p1.0.action (and (= actionNamespace "foobar") (str.in.re actionName (re.++ (re.++ (str.to.re "foo") re.allchar (str.to.re "")) (re.* re.allchar) (str.to.re "bar"))))))
+(assert (= p1.0.action (and (= actionNamespace "foobar") (str.in_re actionName (re.++ (re.++ (str.to_re "foo") re.allchar (str.to_re "")) (re.* re.allchar) (str.to_re "bar"))))))
; Policy: 1
(declare-const p1.denies Bool)
diff --git a/test/regress/regress1/strings/norn-13.smt2 b/test/regress/regress1/strings/norn-13.smt2
index 912f4477a..2a8d9f323 100644
--- a/test/regress/regress1/strings/norn-13.smt2
+++ b/test/regress/regress1/strings/norn-13.smt2
@@ -16,8 +16,8 @@
(declare-fun var_11 () String)
(declare-fun var_12 () String)
-(assert (str.in.re "" (re.* (re.range "a" "u"))))
-(assert (str.in.re var_4 (re.* (re.range "a" "u"))))
-(assert (str.in.re var_4 (re.* (re.union (str.to.re "a") (str.to.re "b")))))
-(assert (not (str.in.re (str.++ var_4 "z" ) (re.* (str.to.re "z")))))
+(assert (str.in_re "" (re.* (re.range "a" "u"))))
+(assert (str.in_re var_4 (re.* (re.range "a" "u"))))
+(assert (str.in_re var_4 (re.* (re.union (str.to_re "a") (str.to_re "b")))))
+(assert (not (str.in_re (str.++ var_4 "z" ) (re.* (str.to_re "z")))))
(check-sat)
diff --git a/test/regress/regress1/strings/norn-360.smt2 b/test/regress/regress1/strings/norn-360.smt2
index 20ab0b338..bdbca494d 100644
--- a/test/regress/regress1/strings/norn-360.smt2
+++ b/test/regress/regress1/strings/norn-360.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_SLIA)
(set-option :strings-exp true)
(set-info :status sat)
@@ -17,10 +17,10 @@
(declare-fun var_11 () String)
(declare-fun var_12 () String)
-(assert (str.in.re (str.++ var_3 "z" var_4 ) (re.++ (re.* (re.union (re.union (str.to.re "z") (str.to.re "b")) (re.++ (str.to.re "a") (re.union (re.union (str.to.re "z") (str.to.re "b")) (str.to.re "a"))))) (str.to.re "a"))))
-(assert (str.in.re (str.++ var_3 "z" var_4 ) (re.++ (re.* (re.union (re.union (str.to.re "z") (str.to.re "b")) (re.++ (str.to.re "a") (re.union (str.to.re "z") (str.to.re "a"))))) (str.to.re "a"))))
-(assert (str.in.re (str.++ var_3 "z" var_4 ) (re.++ (re.* (re.union (str.to.re "z") (re.++ (re.union (str.to.re "b") (str.to.re "a")) (re.union (str.to.re "z") (str.to.re "b"))))) (re.union (str.to.re "b") (str.to.re "a")))))
-(assert (str.in.re var_4 (re.* (re.range "a" "u"))))
-(assert (str.in.re var_3 (re.* (re.range "a" "u"))))
+(assert (str.in_re (str.++ var_3 "z" var_4 ) (re.++ (re.* (re.union (re.union (str.to_re "z") (str.to_re "b")) (re.++ (str.to_re "a") (re.union (re.union (str.to_re "z") (str.to_re "b")) (str.to_re "a"))))) (str.to_re "a"))))
+(assert (str.in_re (str.++ var_3 "z" var_4 ) (re.++ (re.* (re.union (re.union (str.to_re "z") (str.to_re "b")) (re.++ (str.to_re "a") (re.union (str.to_re "z") (str.to_re "a"))))) (str.to_re "a"))))
+(assert (str.in_re (str.++ var_3 "z" var_4 ) (re.++ (re.* (re.union (str.to_re "z") (re.++ (re.union (str.to_re "b") (str.to_re "a")) (re.union (str.to_re "z") (str.to_re "b"))))) (re.union (str.to_re "b") (str.to_re "a")))))
+(assert (str.in_re var_4 (re.* (re.range "a" "u"))))
+(assert (str.in_re var_3 (re.* (re.range "a" "u"))))
(assert (<= 0 (str.len var_4)))
(check-sat)
diff --git a/test/regress/regress1/strings/norn-ab.smt2 b/test/regress/regress1/strings/norn-ab.smt2
index 47c218179..63a95bb78 100644
--- a/test/regress/regress1/strings/norn-ab.smt2
+++ b/test/regress/regress1/strings/norn-ab.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_SLIA)
(set-info :status unsat)
(set-option :strings-exp true)
@@ -17,10 +17,10 @@
(declare-fun var_11 () String)
(declare-fun var_12 () String)
-(assert (str.in.re var_4 (re.++ (str.to.re "a") (re.* (str.to.re "b")))))
-(assert (str.in.re var_4 (re.++ (re.* (str.to.re "a")) (str.to.re "b"))))
-(assert (str.in.re var_4 (re.* (re.range "a" "u"))))
-(assert (str.in.re var_4 (re.++ (re.* (str.to.re "a")) (re.++ (str.to.re "b") (re.* (str.to.re "b"))))))
-(assert (not (str.in.re (str.++ "a" var_4 "b" ) (re.++ (re.* (str.to.re "a")) (re.++ (str.to.re "b") (re.* (str.to.re "b")))))))
+(assert (str.in_re var_4 (re.++ (str.to_re "a") (re.* (str.to_re "b")))))
+(assert (str.in_re var_4 (re.++ (re.* (str.to_re "a")) (str.to_re "b"))))
+(assert (str.in_re var_4 (re.* (re.range "a" "u"))))
+(assert (str.in_re var_4 (re.++ (re.* (str.to_re "a")) (re.++ (str.to_re "b") (re.* (str.to_re "b"))))))
+(assert (not (str.in_re (str.++ "a" var_4 "b" ) (re.++ (re.* (str.to_re "a")) (re.++ (str.to_re "b") (re.* (str.to_re "b")))))))
(assert (and (<= 0 (str.len var_4)) (not (not (exists ((v Int)) (= (* v 2 ) (+ (str.len var_4) 2 )))))))
(check-sat)
diff --git a/test/regress/regress1/strings/norn-nel-bug-052116.smt2 b/test/regress/regress1/strings/norn-nel-bug-052116.smt2
index 9f06152f7..883f7c4dd 100644
--- a/test/regress/regress1/strings/norn-nel-bug-052116.smt2
+++ b/test/regress/regress1/strings/norn-nel-bug-052116.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_S)
(set-info :status sat)
(set-option :strings-exp true)
@@ -17,8 +17,8 @@
(declare-fun var_11 () String)
(declare-fun var_12 () String)
-(assert (str.in.re var_4 (re.* (re.range "a" "u"))))
-(assert (str.in.re var_4 (re.++ (re.* (re.union (str.to.re "a") (re.++ (str.to.re "b") (str.to.re "a")))) (str.to.re "b"))))
-(assert (str.in.re (str.++ "a" var_4 "b" ) (re.* (re.range "a" "u"))))
-(assert (not (str.in.re (str.++ "a" var_4 "b" ) (re.++ (re.* (str.to.re "a")) (re.++ (str.to.re "b") (re.* (str.to.re "b")))))))
+(assert (str.in_re var_4 (re.* (re.range "a" "u"))))
+(assert (str.in_re var_4 (re.++ (re.* (re.union (str.to_re "a") (re.++ (str.to_re "b") (str.to_re "a")))) (str.to_re "b"))))
+(assert (str.in_re (str.++ "a" var_4 "b" ) (re.* (re.range "a" "u"))))
+(assert (not (str.in_re (str.++ "a" var_4 "b" ) (re.++ (re.* (str.to_re "a")) (re.++ (str.to_re "b") (re.* (str.to_re "b")))))))
(check-sat)
diff --git a/test/regress/regress1/strings/norn-simp-rew-sat.smt2 b/test/regress/regress1/strings/norn-simp-rew-sat.smt2
index 1336d3bfc..f7cad1c09 100644
--- a/test/regress/regress1/strings/norn-simp-rew-sat.smt2
+++ b/test/regress/regress1/strings/norn-simp-rew-sat.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_SLIA)
(set-option :strings-exp true)
(set-info :status sat)
@@ -17,10 +17,10 @@
(declare-fun var_11 () String)
(declare-fun var_12 () String)
-(assert (str.in.re (str.++ var_3 "z" var_4 ) (re.++ (re.* (re.union (re.union (str.to.re "z") (str.to.re "a")) (re.++ (str.to.re "b") (re.++ (re.* (str.to.re "b")) (re.union (str.to.re "z") (str.to.re "a")))))) (re.++ (str.to.re "b") (re.* (str.to.re "b"))))))
-(assert (str.in.re var_4 (re.* (re.range "a" "u"))))
-(assert (str.in.re var_4 (re.* (str.to.re "b"))))
-(assert (str.in.re var_3 (re.* (re.range "a" "u"))))
-(assert (str.in.re var_3 (re.* (str.to.re "a"))))
+(assert (str.in_re (str.++ var_3 "z" var_4 ) (re.++ (re.* (re.union (re.union (str.to_re "z") (str.to_re "a")) (re.++ (str.to_re "b") (re.++ (re.* (str.to_re "b")) (re.union (str.to_re "z") (str.to_re "a")))))) (re.++ (str.to_re "b") (re.* (str.to_re "b"))))))
+(assert (str.in_re var_4 (re.* (re.range "a" "u"))))
+(assert (str.in_re var_4 (re.* (str.to_re "b"))))
+(assert (str.in_re var_3 (re.* (re.range "a" "u"))))
+(assert (str.in_re var_3 (re.* (str.to_re "a"))))
(assert (<= 0 (str.len var_4)))
(check-sat)
diff --git a/test/regress/regress1/strings/nt6-dd.smt2 b/test/regress/regress1/strings/nt6-dd.smt2
index 30a0884a3..ad1e4edf5 100644
--- a/test/regress/regress1/strings/nt6-dd.smt2
+++ b/test/regress/regress1/strings/nt6-dd.smt2
@@ -1,13 +1,13 @@
; COMMAND-LINE: --strings-exp --re-elim
; EXPECT: sat
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic ALL)
(set-info :status sat)
(declare-const resource_resource String)
(declare-const p1.0.resource Bool)
-(assert (str.in.re resource_resource (re.++ (str.to.re "ab") (re.* re.allchar) (str.to.re "b") )))
+(assert (str.in_re resource_resource (re.++ (str.to_re "ab") (re.* re.allchar) (str.to_re "b") )))
-(assert (= p1.0.resource (str.in.re resource_resource (re.++ (str.to.re "a") (re.* re.allchar) (str.to.re "b") ))))
+(assert (= p1.0.resource (str.in_re resource_resource (re.++ (str.to_re "a") (re.* re.allchar) (str.to_re "b") ))))
(check-sat)
diff --git a/test/regress/regress1/strings/nterm-re-inter-sigma.smt2 b/test/regress/regress1/strings/nterm-re-inter-sigma.smt2
index 4ac3efff7..63d6a1391 100644
--- a/test/regress/regress1/strings/nterm-re-inter-sigma.smt2
+++ b/test/regress/regress1/strings/nterm-re-inter-sigma.smt2
@@ -1,11 +1,11 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic ALL)
(set-info :status sat)
(set-option :strings-exp true)
(declare-fun x () String)
(assert
-(not (= (str.in.re x (re.++ (re.++ re.allchar re.allchar ) (re.* re.allchar ))) (not (str.in.re x (re.* (str.to.re "A")))))
+(not (= (str.in_re x (re.++ (re.++ re.allchar re.allchar ) (re.* re.allchar ))) (not (str.in_re x (re.* (str.to_re "A")))))
))
(check-sat)
diff --git a/test/regress/regress1/strings/pierre150331.smt2 b/test/regress/regress1/strings/pierre150331.smt2
index e04db8e9a..ae4277874 100644
--- a/test/regress/regress1/strings/pierre150331.smt2
+++ b/test/regress/regress1/strings/pierre150331.smt2
@@ -1,7 +1,6 @@
(set-info :smt-lib-version 2.5)
(set-logic SLIA)
(set-info :status sat)
-(set-info :smt-lib-version 2.5)
(set-option :strings-exp true)
(define-fun stringEval ((?s String)) Bool (str.in.re ?s
(re.union
diff --git a/test/regress/regress1/strings/policy_variable.smt2 b/test/regress/regress1/strings/policy_variable.smt2
index 4d14e95d5..c74765108 100644
--- a/test/regress/regress1/strings/policy_variable.smt2
+++ b/test/regress/regress1/strings/policy_variable.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic ALL)
(set-info :status unsat)
(set-option :strings-exp true)
diff --git a/test/regress/regress1/strings/query4674.smt2 b/test/regress/regress1/strings/query4674.smt2
index 7132fa6a8..86a08162a 100644
--- a/test/regress/regress1/strings/query4674.smt2
+++ b/test/regress/regress1/strings/query4674.smt2
@@ -4,5 +4,5 @@
(set-option :strings-exp true)
(set-option :re-elim false)
(declare-fun x () String)
-(assert (let ((_let_0 (re.* re.allchar ))) (and (not (= (str.in.re x (re.++ _let_0 re.allchar _let_0 (str.to.re (str.++ "A" (str.++ "B" (str.++ "C" "A")))) _let_0 re.allchar _let_0)) (str.in.re x (re.++ _let_0 re.allchar _let_0 re.allchar _let_0 (str.to.re (str.++ "B" (str.++ "C" (str.++ "B" "B")))) _let_0)))) (not (= (str.in.re x (re.++ _let_0 re.allchar _let_0 (str.to.re (str.++ "C" (str.++ "B" "C"))) _let_0 (str.to.re "B") _let_0)) (str.in.re x (re.++ _let_0 re.allchar _let_0 (str.to.re "C") _let_0 (str.to.re (str.++ "B" (str.++ "C" "B"))) _let_0)))))))
+(assert (let ((_let_0 (re.* re.allchar ))) (and (not (= (str.in_re x (re.++ _let_0 re.allchar _let_0 (str.to_re (str.++ "A" (str.++ "B" (str.++ "C" "A")))) _let_0 re.allchar _let_0)) (str.in_re x (re.++ _let_0 re.allchar _let_0 re.allchar _let_0 (str.to_re (str.++ "B" (str.++ "C" (str.++ "B" "B")))) _let_0)))) (not (= (str.in_re x (re.++ _let_0 re.allchar _let_0 (str.to_re (str.++ "C" (str.++ "B" "C"))) _let_0 (str.to_re "B") _let_0)) (str.in_re x (re.++ _let_0 re.allchar _let_0 (str.to_re "C") _let_0 (str.to_re (str.++ "B" (str.++ "C" "B"))) _let_0)))))))
(check-sat)
diff --git a/test/regress/regress1/strings/query8485.smt2 b/test/regress/regress1/strings/query8485.smt2
index ccd3b7f9a..ca222119f 100644
--- a/test/regress/regress1/strings/query8485.smt2
+++ b/test/regress/regress1/strings/query8485.smt2
@@ -4,5 +4,5 @@
(set-option :strings-exp true)
(set-option :re-elim false)
(declare-fun x () String)
-(assert (let ((_let_0 (re.* re.allchar ))) (and (not (= (str.in.re x (re.++ _let_0 re.allchar _let_0 (str.to.re (str.++ "B" (str.++ "A" (str.++ "C" "B")))) _let_0 re.allchar _let_0)) (str.in.re x (re.++ _let_0 re.allchar _let_0 (str.to.re (str.++ "A" (str.++ "B" (str.++ "C" "C")))) _let_0 re.allchar _let_0)))) (not (= (str.in.re x (re.++ _let_0 re.allchar _let_0 (str.to.re (str.++ "C" (str.++ "B" (str.++ "A" "B")))) _let_0 re.allchar _let_0)) (str.in.re x (re.++ _let_0 re.allchar _let_0 (str.to.re (str.++ "C" (str.++ "B" "A"))) _let_0 (str.to.re "B") _let_0)))))))
+(assert (let ((_let_0 (re.* re.allchar ))) (and (not (= (str.in_re x (re.++ _let_0 re.allchar _let_0 (str.to_re (str.++ "B" (str.++ "A" (str.++ "C" "B")))) _let_0 re.allchar _let_0)) (str.in_re x (re.++ _let_0 re.allchar _let_0 (str.to_re (str.++ "A" (str.++ "B" (str.++ "C" "C")))) _let_0 re.allchar _let_0)))) (not (= (str.in_re x (re.++ _let_0 re.allchar _let_0 (str.to_re (str.++ "C" (str.++ "B" (str.++ "A" "B")))) _let_0 re.allchar _let_0)) (str.in_re x (re.++ _let_0 re.allchar _let_0 (str.to_re (str.++ "C" (str.++ "B" "A"))) _let_0 (str.to_re "B") _let_0)))))))
(check-sat)
diff --git a/test/regress/regress1/strings/re-agg-total1.smt2 b/test/regress/regress1/strings/re-agg-total1.smt2
index 2950066a0..fba863a6c 100644
--- a/test/regress/regress1/strings/re-agg-total1.smt2
+++ b/test/regress/regress1/strings/re-agg-total1.smt2
@@ -7,9 +7,9 @@
(declare-const y String)
-(assert (str.in.re x (re.* (str.to.re "ab") ) ) )
-(assert (str.in.re x (re.* (str.to.re "abab") ) ) )
-(assert (str.in.re x (re.* (str.to.re "ababac") ) ) )
+(assert (str.in_re x (re.* (str.to_re "ab") ) ) )
+(assert (str.in_re x (re.* (str.to_re "abab") ) ) )
+(assert (str.in_re x (re.* (str.to_re "ababac") ) ) )
(assert (> (str.len x) 1) )
diff --git a/test/regress/regress1/strings/re-agg-total2.smt2 b/test/regress/regress1/strings/re-agg-total2.smt2
index 54bf493a3..80e422224 100644
--- a/test/regress/regress1/strings/re-agg-total2.smt2
+++ b/test/regress/regress1/strings/re-agg-total2.smt2
@@ -5,8 +5,8 @@
(set-option :re-elim-agg true)
(declare-const x String)
(declare-const y String)
-(assert (str.in.re x (re.* (str.to.re "'\r''k'\n'"))))
-(assert (str.in.re x (re.* (str.to.re "'\r''k'\n''\r''k'\n'"))))
+(assert (str.in_re x (re.* (str.to_re "'\r''k'\n'"))))
+(assert (str.in_re x (re.* (str.to_re "'\r''k'\n''\r''k'\n'"))))
(assert (> (str.len x) 20))
(assert (< (str.len x) 25))
(check-sat)
diff --git a/test/regress/regress1/strings/re-all-char-hard.smt2 b/test/regress/regress1/strings/re-all-char-hard.smt2
index 2a643ac88..fc156c116 100644
--- a/test/regress/regress1/strings/re-all-char-hard.smt2
+++ b/test/regress/regress1/strings/re-all-char-hard.smt2
@@ -6,6 +6,6 @@
(declare-fun x () String)
; we should not intersect these two regular expressions
-(assert (str.in.re x (re.++ (str.to.re "abc:def:ghi:") (re.* re.allchar ) (str.to.re ":") (re.* re.allchar ) (str.to.re ":cluster/sflower-bottle-guide-") (re.* re.allchar ))))
-(assert (str.in.re x (re.++ (re.* re.allchar ) (str.to.re ":") (re.* re.allchar ) (str.to.re ":") (re.* re.allchar ) (str.to.re ":") (re.* re.allchar ) (str.to.re ":") (re.* re.allchar ) (str.to.re ":") (re.* re.allchar ))))
+(assert (str.in_re x (re.++ (str.to_re "abc:def:ghi:") (re.* re.allchar ) (str.to_re ":") (re.* re.allchar ) (str.to_re ":cluster/sflower-bottle-guide-") (re.* re.allchar ))))
+(assert (str.in_re x (re.++ (re.* re.allchar ) (str.to_re ":") (re.* re.allchar ) (str.to_re ":") (re.* re.allchar ) (str.to_re ":") (re.* re.allchar ) (str.to_re ":") (re.* re.allchar ) (str.to_re ":") (re.* re.allchar ))))
(check-sat)
diff --git a/test/regress/regress1/strings/re-elim-exact.smt2 b/test/regress/regress1/strings/re-elim-exact.smt2
index 62b934610..9504aad93 100644
--- a/test/regress/regress1/strings/re-elim-exact.smt2
+++ b/test/regress/regress1/strings/re-elim-exact.smt2
@@ -1,10 +1,10 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic ALL)
(set-info :status sat)
(set-option :strings-exp true)
(set-option :re-elim true)
(declare-fun x () String)
-(assert (str.in.re x (re.++ re.allchar (str.to.re "A") re.allchar (str.to.re "B") re.allchar)))
+(assert (str.in_re x (re.++ re.allchar (str.to_re "A") re.allchar (str.to_re "B") re.allchar)))
(check-sat)
diff --git a/test/regress/regress1/strings/re-mod-eq.smt2 b/test/regress/regress1/strings/re-mod-eq.smt2
index 531556e6d..ff20ec9d4 100644
--- a/test/regress/regress1/strings/re-mod-eq.smt2
+++ b/test/regress/regress1/strings/re-mod-eq.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_SLIA)
(set-option :strings-exp true)
(set-info :status unsat)
@@ -6,8 +6,8 @@
(declare-fun y () String)
(declare-fun z () String)
(assert (or (= x y)(= x z)))
-(assert (str.in.re x (re.++ (str.to.re "A") (re.* (str.to.re "BAA")))))
-(assert (str.in.re y (re.++ (str.to.re "AB") (re.* (str.to.re "AAB")) (str.to.re "A"))))
-(assert (str.in.re z (re.++ (str.to.re "AB") (re.* (str.to.re "AAB")) (str.to.re "A"))))
+(assert (str.in_re x (re.++ (str.to_re "A") (re.* (str.to_re "BAA")))))
+(assert (str.in_re y (re.++ (str.to_re "AB") (re.* (str.to_re "AAB")) (str.to_re "A"))))
+(assert (str.in_re z (re.++ (str.to_re "AB") (re.* (str.to_re "AAB")) (str.to_re "A"))))
; requires RE solver to reason modulo string equalties
(check-sat)
diff --git a/test/regress/regress1/strings/re-neg-concat-reduct.smt2 b/test/regress/regress1/strings/re-neg-concat-reduct.smt2
index cbe8c4a8b..0f20f80a3 100644
--- a/test/regress/regress1/strings/re-neg-concat-reduct.smt2
+++ b/test/regress/regress1/strings/re-neg-concat-reduct.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_S)
(set-info :status sat)
(set-option :strings-exp true)
@@ -6,7 +6,7 @@
(declare-fun x () String)
(assert (not (= x "")))
-(assert (not (str.in.re x (re.++ (str.to.re "AB") (re.* (str.to.re "A"))))))
-(assert (not (str.in.re x (re.++ (re.* (str.to.re "A")) (str.to.re "B")))))
+(assert (not (str.in_re x (re.++ (str.to_re "AB") (re.* (str.to_re "A"))))))
+(assert (not (str.in_re x (re.++ (re.* (str.to_re "A")) (str.to_re "B")))))
(check-sat)
diff --git a/test/regress/regress1/strings/re-neg-unfold-rev-a.smt2 b/test/regress/regress1/strings/re-neg-unfold-rev-a.smt2
index 3f99f8507..0f869f155 100644
--- a/test/regress/regress1/strings/re-neg-unfold-rev-a.smt2
+++ b/test/regress/regress1/strings/re-neg-unfold-rev-a.smt2
@@ -1,10 +1,10 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_S)
(set-info :status unsat)
(set-option :strings-exp true)
(declare-const x String)
(declare-const y String)
-(assert (and (= y "foobar") (str.in.re x (re.++ (str.to.re "ab") (re.* re.allchar) (str.to.re "b") (re.* re.allchar) (str.to.re "b") (re.* re.allchar) (str.to.re "b")))))
-(assert (not (and (= y "foobar") (str.in.re x (re.++ (str.to.re "a") (re.* re.allchar) (str.to.re "b") (re.* re.allchar) (str.to.re "b") (re.* re.allchar) (str.to.re "b"))))))
+(assert (and (= y "foobar") (str.in_re x (re.++ (str.to_re "ab") (re.* re.allchar) (str.to_re "b") (re.* re.allchar) (str.to_re "b") (re.* re.allchar) (str.to_re "b")))))
+(assert (not (and (= y "foobar") (str.in_re x (re.++ (str.to_re "a") (re.* re.allchar) (str.to_re "b") (re.* re.allchar) (str.to_re "b") (re.* re.allchar) (str.to_re "b"))))))
(check-sat)
diff --git a/test/regress/regress1/strings/re-unsound-080718.smt2 b/test/regress/regress1/strings/re-unsound-080718.smt2
index 96353e746..552a0a706 100644
--- a/test/regress/regress1/strings/re-unsound-080718.smt2
+++ b/test/regress/regress1/strings/re-unsound-080718.smt2
@@ -1,18 +1,18 @@
; COMMAND-LINE: --strings-print-ascii --strings-exp
; EXPECT: sat
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic ALL)
(set-info :status sat)
(declare-fun x () String)
(assert
(and
(not (=
- (str.in.re x (re.++ (str.to.re "B") (re.* (str.to.re "B"))))
- (str.in.re x (re.++ (str.to.re "B") (str.to.re (str.++ "B" "B"))))
+ (str.in_re x (re.++ (str.to_re "B") (re.* (str.to_re "B"))))
+ (str.in_re x (re.++ (str.to_re "B") (str.to_re (str.++ "B" "B"))))
))
(not (=
- (str.in.re x (re.++ (re.union (re.++ (str.to.re "A") re.allchar ) re.allchar ) (str.to.re "B")))
- (str.in.re x (re.++ (str.to.re "A") (str.to.re "B")))
+ (str.in_re x (re.++ (re.union (re.++ (str.to_re "A") re.allchar ) re.allchar ) (str.to_re "B")))
+ (str.in_re x (re.++ (str.to_re "A") (str.to_re "B")))
))
)
)
diff --git a/test/regress/regress1/strings/regexp-strat-fix.smt2 b/test/regress/regress1/strings/regexp-strat-fix.smt2
index 9ff78c935..349774663 100644
--- a/test/regress/regress1/strings/regexp-strat-fix.smt2
+++ b/test/regress/regress1/strings/regexp-strat-fix.smt2
@@ -1,8 +1,8 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_S)
(set-info :status unsat)
(set-option :strings-exp true)
(declare-fun var0 () String)
-(assert (str.in.re var0 (re.* (re.* (str.to.re "0")))))
-(assert (not (str.in.re var0 (re.union (re.+ (str.to.re "0")) (re.* (str.to.re "1"))))))
+(assert (str.in_re var0 (re.* (re.* (str.to_re "0")))))
+(assert (not (str.in_re var0 (re.union (re.+ (str.to_re "0")) (re.* (str.to_re "1"))))))
(check-sat)
diff --git a/test/regress/regress1/strings/regexp001.smt2 b/test/regress/regress1/strings/regexp001.smt2
index 142ff679d..0562e6655 100644
--- a/test/regress/regress1/strings/regexp001.smt2
+++ b/test/regress/regress1/strings/regexp001.smt2
@@ -1,12 +1,12 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_S)
(set-info :status sat)
(set-option :strings-exp true)
(declare-fun x () String)
-(assert (str.in.re x
- (re.* (re.++ (re.* (str.to.re "a") ) (str.to.re "b") ))
+(assert (str.in_re x
+ (re.* (re.++ (re.* (str.to_re "a") ) (str.to_re "b") ))
))
(assert (= (str.len x) 3))
diff --git a/test/regress/regress1/strings/regexp002.smt2 b/test/regress/regress1/strings/regexp002.smt2
index f109a484e..35501ac10 100644
--- a/test/regress/regress1/strings/regexp002.smt2
+++ b/test/regress/regress1/strings/regexp002.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_S)
(set-info :status sat)
(set-option :strings-exp true)
@@ -10,12 +10,12 @@
(declare-fun x () String)
(declare-fun y () String)
-(assert (str.in.re x
- (re.* (re.++ (re.* (str.to.re "a") ) (str.to.re "b") ))
+(assert (str.in_re x
+ (re.* (re.++ (re.* (str.to_re "a") ) (str.to_re "b") ))
))
-(assert (str.in.re y
- (re.* (re.++ (re.* (str.to.re "a") ) (str.to.re "b") ))
+(assert (str.in_re y
+ (re.* (re.++ (re.* (str.to_re "a") ) (str.to_re "b") ))
))
(assert (not (= x y)))
diff --git a/test/regress/regress1/strings/regexp003.smt2 b/test/regress/regress1/strings/regexp003.smt2
index 7c05b422f..fa3828745 100644
--- a/test/regress/regress1/strings/regexp003.smt2
+++ b/test/regress/regress1/strings/regexp003.smt2
@@ -1,14 +1,14 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_S)
(set-info :status sat)
(set-option :strings-exp true)
(declare-const s String)
-(assert (str.in.re s (re.inter
- (re.++ (str.to.re "a") (re.* (str.to.re "b"))
- (re.inter (str.to.re "c") (re.* (str.to.re "c"))))
- (re.++ (str.to.re "a") (re.* (str.to.re "b")) (re.* (str.to.re "c")))
+(assert (str.in_re s (re.inter
+ (re.++ (str.to_re "a") (re.* (str.to_re "b"))
+ (re.inter (str.to_re "c") (re.* (str.to_re "c"))))
+ (re.++ (str.to_re "a") (re.* (str.to_re "b")) (re.* (str.to_re "c")))
)))
(check-sat)
diff --git a/test/regress/regress1/strings/reloop.smt2 b/test/regress/regress1/strings/reloop.smt2
index 6230d1656..1e9050178 100644
--- a/test/regress/regress1/strings/reloop.smt2
+++ b/test/regress/regress1/strings/reloop.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_SLIA)
(set-option :strings-exp true)
(set-info :status sat)
@@ -8,11 +8,11 @@
(declare-fun z () String)
(declare-fun w () String)
-(assert (str.in.re x ((_ re.^ 5) (str.to.re "a"))))
-(assert (str.in.re y ((_ re.loop 2 5) (str.to.re "b"))))
-(assert (str.in.re z ((_ re.loop 5 15) (str.to.re "c"))))
+(assert (str.in_re x ((_ re.^ 5) (str.to_re "a"))))
+(assert (str.in_re y ((_ re.loop 2 5) (str.to_re "b"))))
+(assert (str.in_re z ((_ re.loop 5 15) (str.to_re "c"))))
(assert (> (str.len z) 7))
-(assert (str.in.re w ((_ re.loop 2 7) (str.to.re "b"))))
+(assert (str.in_re w ((_ re.loop 2 7) (str.to_re "b"))))
(assert (> (str.len w) 2))
(assert (< (str.len w) 5))
diff --git a/test/regress/regress1/strings/replaceall-len.smt2 b/test/regress/regress1/strings/replaceall-len.smt2
index 448d8e98f..3c0d7e8e5 100644
--- a/test/regress/regress1/strings/replaceall-len.smt2
+++ b/test/regress/regress1/strings/replaceall-len.smt2
@@ -1,10 +1,10 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic ALL)
(set-info :status sat)
(set-option :strings-exp true)
(set-option :strings-fmf true)
(set-option :produce-models true)
(declare-fun x () String)
-(assert (= (str.len (str.replaceall x "B" "CC")) (+ (str.len x) 2)))
+(assert (= (str.len (str.replace_all x "B" "CC")) (+ (str.len x) 2)))
(assert (> (str.len x) 2))
(check-sat)
diff --git a/test/regress/regress1/strings/replaceall-replace.smt2 b/test/regress/regress1/strings/replaceall-replace.smt2
index 5bf5b5b16..5f62ff4d5 100644
--- a/test/regress/regress1/strings/replaceall-replace.smt2
+++ b/test/regress/regress1/strings/replaceall-replace.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic ALL)
(set-info :status sat)
(set-option :strings-exp true)
@@ -9,5 +9,5 @@
(declare-fun z () String)
(assert (not (= x "")))
(assert (not (= y "")))
-(assert (not (= (str.replace x y z) (str.replaceall x y z))))
+(assert (not (= (str.replace x y z) (str.replace_all x y z))))
(check-sat)
diff --git a/test/regress/regress1/strings/rew-check1.smt2 b/test/regress/regress1/strings/rew-check1.smt2
index 5cb85e4ca..2de2c5747 100644
--- a/test/regress/regress1/strings/rew-check1.smt2
+++ b/test/regress/regress1/strings/rew-check1.smt2
@@ -1,10 +1,10 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic ALL)
(set-info :status unsat)
(declare-fun x () String)
(assert (not (=
-(str.in.re x (re.++ (re.* re.allchar ) (str.to.re "A") (re.* re.allchar ) re.allchar (re.* re.allchar ) (re.* (str.to.re "A")) (re.* re.allchar )))
-(str.in.re x (re.++ (re.* (str.to.re "A")) (re.* (str.to.re "B")) (re.* re.allchar ) (str.to.re "A") (re.* re.allchar ) re.allchar (re.* re.allchar )))
+(str.in_re x (re.++ (re.* re.allchar ) (str.to_re "A") (re.* re.allchar ) re.allchar (re.* re.allchar ) (re.* (str.to_re "A")) (re.* re.allchar )))
+(str.in_re x (re.++ (re.* (str.to_re "A")) (re.* (str.to_re "B")) (re.* re.allchar ) (str.to_re "A") (re.* re.allchar ) re.allchar (re.* re.allchar )))
)))
(check-sat)
diff --git a/test/regress/regress1/strings/simple-re-consume.smt2 b/test/regress/regress1/strings/simple-re-consume.smt2
index af34ef1c9..d8facc6c8 100644
--- a/test/regress/regress1/strings/simple-re-consume.smt2
+++ b/test/regress/regress1/strings/simple-re-consume.smt2
@@ -1,6 +1,6 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_SLIA)
(set-info :status sat)
(declare-fun x () String)
-(assert (str.in.re (str.++ "bbbbbbbb" x) (re.* (re.++ (str.to.re "bbbb") (re.* (str.to.re "aaaa"))))))
+(assert (str.in_re (str.++ "bbbbbbbb" x) (re.* (re.++ (str.to_re "bbbb") (re.* (str.to_re "aaaa"))))))
(check-sat)
diff --git a/test/regress/regress1/strings/stoi-400million.smt2 b/test/regress/regress1/strings/stoi-400million.smt2
index 9b9acf673..6bb992a5e 100644
--- a/test/regress/regress1/strings/stoi-400million.smt2
+++ b/test/regress/regress1/strings/stoi-400million.smt2
@@ -1,7 +1,7 @@
; COMMAND-LINE: --strings-exp
; EXPECT: sat
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic ALL)
(declare-fun s () String)
-(assert (> (str.to.int s) 400000000))
+(assert (> (str.to_int s) 400000000))
(check-sat)
diff --git a/test/regress/regress1/strings/stoi-solve.smt2 b/test/regress/regress1/strings/stoi-solve.smt2
index 4fbbdcfc1..e84f5b42c 100644
--- a/test/regress/regress1/strings/stoi-solve.smt2
+++ b/test/regress/regress1/strings/stoi-solve.smt2
@@ -2,5 +2,5 @@
(set-info :status sat)
(set-option :strings-exp true)
(declare-fun x () String)
-(assert (= (str.to.int x) 12345))
+(assert (= (str.to_int x) 12345))
(check-sat)
diff --git a/test/regress/regress1/strings/str-code-sat.smt2 b/test/regress/regress1/strings/str-code-sat.smt2
index 1acc091c1..7345e25bb 100644
--- a/test/regress/regress1/strings/str-code-sat.smt2
+++ b/test/regress/regress1/strings/str-code-sat.smt2
@@ -5,19 +5,19 @@
(declare-fun z () String)
(declare-fun w () String)
-(assert (>= (str.code x) 65))
-(assert (<= (str.code x) 75))
+(assert (>= (str.to_code x) 65))
+(assert (<= (str.to_code x) 75))
-(assert (>= (str.code y) 65))
-(assert (<= (str.code y) 75))
+(assert (>= (str.to_code y) 65))
+(assert (<= (str.to_code y) 75))
-(assert (>= (str.code z) 65))
-(assert (<= (str.code z) 75))
+(assert (>= (str.to_code z) 65))
+(assert (<= (str.to_code z) 75))
(assert (= (str.len w) 1))
-(assert (= (+ (str.code x) (str.code y)) 140))
-(assert (= (+ (str.code x) (str.code z)) 141))
+(assert (= (+ (str.to_code x) (str.to_code y)) 140))
+(assert (= (+ (str.to_code x) (str.to_code z)) 141))
(assert (distinct x y z w "A" "B" "C" "D" "AA"))
diff --git a/test/regress/regress1/strings/str-code-unsat-2.smt2 b/test/regress/regress1/strings/str-code-unsat-2.smt2
index 38116061e..721cbc533 100644
--- a/test/regress/regress1/strings/str-code-unsat-2.smt2
+++ b/test/regress/regress1/strings/str-code-unsat-2.smt2
@@ -2,5 +2,5 @@
(set-info :status unsat)
(declare-fun x () String)
(assert (= (str.len x) 1))
-(assert (or (< (str.code x) 0) (> (str.code x) 10000000000000000000000000000)))
+(assert (or (< (str.to_code x) 0) (> (str.to_code x) 10000000000000000000000000000)))
(check-sat)
diff --git a/test/regress/regress1/strings/str-code-unsat-3.smt2 b/test/regress/regress1/strings/str-code-unsat-3.smt2
index fa34785c2..06d297fe8 100644
--- a/test/regress/regress1/strings/str-code-unsat-3.smt2
+++ b/test/regress/regress1/strings/str-code-unsat-3.smt2
@@ -4,17 +4,17 @@
(declare-fun y () String)
(declare-fun z () String)
-(assert (>= (str.code x) 65))
-(assert (<= (str.code x) 75))
+(assert (>= (str.to_code x) 65))
+(assert (<= (str.to_code x) 75))
-(assert (>= (str.code y) 65))
-(assert (<= (str.code y) 75))
+(assert (>= (str.to_code y) 65))
+(assert (<= (str.to_code y) 75))
-(assert (>= (str.code z) 65))
-(assert (<= (str.code z) 75))
+(assert (>= (str.to_code z) 65))
+(assert (<= (str.to_code z) 75))
-(assert (= (+ (str.code x) (str.code y)) 140))
-(assert (= (+ (str.code x) (str.code z)) 141))
+(assert (= (+ (str.to_code x) (str.to_code y)) 140))
+(assert (= (+ (str.to_code x) (str.to_code z)) 141))
(assert (distinct x y z "B" "C" "D" "E"))
diff --git a/test/regress/regress1/strings/str-code-unsat.smt2 b/test/regress/regress1/strings/str-code-unsat.smt2
index 6a3e9062b..118ab7750 100644
--- a/test/regress/regress1/strings/str-code-unsat.smt2
+++ b/test/regress/regress1/strings/str-code-unsat.smt2
@@ -4,17 +4,17 @@
(declare-fun y () String)
(declare-fun z () String)
-(assert (>= (str.code x) 65))
-(assert (<= (str.code x) 75))
+(assert (>= (str.to_code x) 65))
+(assert (<= (str.to_code x) 75))
-(assert (>= (str.code y) 65))
-(assert (<= (str.code y) 75))
+(assert (>= (str.to_code y) 65))
+(assert (<= (str.to_code y) 75))
-(assert (>= (str.code z) 65))
-(assert (<= (str.code z) 75))
+(assert (>= (str.to_code z) 65))
+(assert (<= (str.to_code z) 75))
-(assert (= (+ (str.code x) (str.code y)) 140))
-(assert (= (+ (str.code x) (str.code z)) 140))
+(assert (= (+ (str.to_code x) (str.to_code y)) 140))
+(assert (= (+ (str.to_code x) (str.to_code z)) 140))
(assert (distinct x y z))
diff --git a/test/regress/regress1/strings/string-unsound-sem.smt2 b/test/regress/regress1/strings/string-unsound-sem.smt2
index 44591b47b..59c2d4a17 100644
--- a/test/regress/regress1/strings/string-unsound-sem.smt2
+++ b/test/regress/regress1/strings/string-unsound-sem.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic ALL)
(set-option :strings-exp true)
(set-info :status sat)
@@ -6,7 +6,7 @@
(declare-fun y () String)
(declare-fun z () Int)
(assert (and
-(not (= (str.replace "A" (int.to.str z) x) (str.++ "A" (str.replace "" (int.to.str z) x))))
+(not (= (str.replace "A" (str.from_int z) x) (str.++ "A" (str.replace "" (str.from_int z) x))))
(not (= (str.replace x (str.at x z) "") (str.++ (str.replace (str.++ (str.substr x 0 z) (str.substr x z 1)) (str.substr x z 1) "") (str.substr x (+ 1 z) (str.len x)))))
)
)
diff --git a/test/regress/regress1/strings/type002.smt2 b/test/regress/regress1/strings/type002.smt2
index 3b46b25a8..af2e293c2 100644
--- a/test/regress/regress1/strings/type002.smt2
+++ b/test/regress/regress1/strings/type002.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_SLIA)
(set-info :status sat)
(set-option :strings-exp true)
@@ -9,7 +9,7 @@
(declare-fun i () Int)
(assert (>= i 420))
-(assert (= x (int.to.str i)))
+(assert (= x (str.from_int i)))
(assert (= x (str.++ y "0" z)))
(assert (not (= y "")))
(assert (not (= z "")))
diff --git a/test/regress/regress1/strings/type003.smt2 b/test/regress/regress1/strings/type003.smt2
index 332ec3ec3..87c8b3903 100644
--- a/test/regress/regress1/strings/type003.smt2
+++ b/test/regress/regress1/strings/type003.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_SLIA)
(set-info :status sat)
(set-option :strings-exp true)
@@ -6,7 +6,7 @@
(declare-fun i () Int)
(declare-fun s () String)
-(assert (< 67 (str.to.int s)))
+(assert (< 67 (str.to_int s)))
(assert (= (str.len s) 2))
(assert (not (= s "68")))
diff --git a/test/regress/regress1/strings/username_checker_min.smt2 b/test/regress/regress1/strings/username_checker_min.smt2
index f6c152a2a..c4c21dfac 100644
--- a/test/regress/regress1/strings/username_checker_min.smt2
+++ b/test/regress/regress1/strings/username_checker_min.smt2
@@ -1,4 +1,4 @@
-(set-info :smt-lib-version 2.5)
+(set-info :smt-lib-version 2.6)
(set-logic QF_S)
(set-option :strings-exp true)
(set-info :status unsat)
@@ -8,7 +8,7 @@
(assert (= (str.len buff) 4))
(assert (= (str.len pass_mem) 1))
-(assert (str.in.re (str.++ buff pass_mem) (re.+ (str.to.re "A"))))
+(assert (str.in_re (str.++ buff pass_mem) (re.+ (str.to_re "A"))))
(assert (str.contains buff "<"))
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback