Skip to content

Commit

Permalink
Merge branch 'main' into sam/hashset
Browse files Browse the repository at this point in the history
  • Loading branch information
samuelchassot committed Sep 5, 2024
2 parents 1521163 + bcbc6f8 commit fe96954
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 7 deletions.
1 change: 1 addition & 0 deletions data-structures/maps/mutablemaps/stainless.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ solvers = "smt-cvc5,smt-z3,smt-cvc4"
check-measures = yes
infer-measures = true
simplifier = "ol"
compact = true
1 change: 1 addition & 0 deletions lexers/regex/verifiedlexer/stainless.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ solvers = "smt-cvc5,smt-z3,smt-cvc4"
check-measures = yes
infer-measures = true
simplifier = "bland"
compact = true
3 changes: 2 additions & 1 deletion run-one-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ function run_tests {
conf=stainless.conf.nightly
fi
echo ""
echo `date`
echo "------------------------------------------------------------------------------------------"
# Check if there is a verify.sh file in the project folder
# If yes, then echo a message saying we run it and its content, then run it, other run the command X
Expand Down Expand Up @@ -45,4 +46,4 @@ function run_tests {
echo ""
}

run_tests "${@:2}"
run_tests "${@:2}"
2 changes: 1 addition & 1 deletion stainless.conf.nightly
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
vc-cache = false
timeout = 300
fail-early = true
strict-arithmetic = false
solvers="smt-z3"
no-colors=true
compact=true
8 changes: 4 additions & 4 deletions tutorials/const-fold/ConstFold.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ import stainless.lang.{ghost => ghostExpr, *}
object ConstFold:

sealed abstract class Expr
case class Number(value: Int) extends Expr
case class Number(value: BigInt) extends Expr
case class Var(name: String) extends Expr
case class Add(e1: Expr, e2: Expr) extends Expr
case class Minus(e1: Expr, e2: Expr) extends Expr
case class Mul(e1: Expr, e2: Expr) extends Expr

type Env = String => Int
val zeroEnv = (_:String) => 0
type Env = String => BigInt
val zeroEnv: Env = (_:String) => BigInt(0)

def evaluate(ctx: Env, e: Expr): Int =
def evaluate(ctx: Env, e: Expr): BigInt =
e match
case Number(value) => value
case Var(name) => ctx(name)
Expand Down
2 changes: 1 addition & 1 deletion tutorials/const-fold/stainless.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
strict-arithmetic = false
timeout = 15
timeout = 25
compact = true
no-colors = true
solvers = smt-cvc5

0 comments on commit fe96954

Please sign in to comment.