Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
inox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LARA
inox
Commits
33dd2e2b
Commit
33dd2e2b
authored
14 years ago
by
Philippe Suter
Browse files
Options
Downloads
Patches
Plain Diff
on my way to killing the bug, but food doesn't wait
parent
20360eb7
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/purescala/Analysis.scala
+30
-16
30 additions, 16 deletions
src/purescala/Analysis.scala
src/purescala/Trees.scala
+28
-0
28 additions, 0 deletions
src/purescala/Trees.scala
src/purescala/Z3Solver.scala
+39
-39
39 additions, 39 deletions
src/purescala/Z3Solver.scala
with
97 additions
and
55 deletions
src/purescala/Analysis.scala
+
30
−
16
View file @
33dd2e2b
...
@@ -113,19 +113,29 @@ class Analysis(val program: Program) {
...
@@ -113,19 +113,29 @@ class Analysis(val program: Program) {
}
}
import
Analysis._
import
Analysis._
val
(
newExpr0
,
sideExprs0
)
=
unrollRecursiveFunctions
(
program
,
withPrec
,
Settings
.
unrollingLevel
)
reporter
.
info
(
"Before unrolling:"
)
val
expr0
=
simplifyLets
(
Implies
(
And
(
sideExprs0
),
newExpr0
))
reporter
.
info
(
withPrec
)
val
(
newExpr1
,
sideExprs1
)
=
inlineFunctionsAndContracts
(
program
,
expr0
)
val
expr0
=
unrollRecursiveFunctions
(
program
,
withPrec
,
Settings
.
unrollingLevel
)
val
expr1
=
simplifyLets
(
Implies
(
And
(
sideExprs1
),
newExpr1
))
reporter
.
info
(
"Before inlining:"
)
reporter
.
info
(
expr0
)
val
expr1
=
inlineFunctionsAndContracts
(
program
,
expr0
)
reporter
.
info
(
"Before PM-rewriting:"
)
reporter
.
info
(
expr1
)
val
(
newExpr2
,
sideExprs2
)
=
rewriteSimplePatternMatching
(
expr1
)
val
(
newExpr2
,
sideExprs2
)
=
rewriteSimplePatternMatching
(
expr1
)
simplifyLets
(
Implies
(
And
(
sideExprs2
),
newExpr2
))
val
expr2
=
(
pulloutLets
(
Implies
(
And
(
sideExprs2
),
newExpr2
)))
reporter
.
info
(
"After PM-rewriting:"
)
reporter
.
info
(
expr2
)
expr2
}
}
}
}
}
}
object
Analysis
{
object
Analysis
{
def
inlineFunctionsAndContracts
(
program
:
Program
,
expr
:
Expr
)
:
(
Expr
,
Seq
[
Expr
])
=
{
// Warning: this should only be called on a top-level formula ! It will add
// new variables and implications in a way that preserves the validity of the
// formula.
def
inlineFunctionsAndContracts
(
program
:
Program
,
expr
:
Expr
)
:
Expr
=
{
var
extras
:
List
[
Expr
]
=
Nil
var
extras
:
List
[
Expr
]
=
Nil
val
isFunCall
:
Function
[
Expr
,
Boolean
]
=
_
.
isInstanceOf
[
FunctionInvocation
]
val
isFunCall
:
Function
[
Expr
,
Boolean
]
=
_
.
isInstanceOf
[
FunctionInvocation
]
...
@@ -156,10 +166,14 @@ object Analysis {
...
@@ -156,10 +166,14 @@ object Analysis {
case
o
=>
o
case
o
=>
o
}
}
(
searchAndApply
(
isFunCall
,
applyToCall
,
expr
),
extras
.
reverse
)
val
finalE
=
searchAndApply
(
isFunCall
,
applyToCall
,
expr
)
pulloutLets
(
Implies
(
And
(
extras
.
reverse
),
finalE
))
}
}
def
unrollRecursiveFunctions
(
program
:
Program
,
expression
:
Expr
,
times
:
Int
)
:
(
Expr
,
Seq
[
Expr
])
=
{
// Warning: this should only be called on a top-level formula ! It will add
// new variables and implications in a way that preserves the validity of the
// formula.
def
unrollRecursiveFunctions
(
program
:
Program
,
expression
:
Expr
,
times
:
Int
)
:
Expr
=
{
var
extras
:
List
[
Expr
]
=
Nil
var
extras
:
List
[
Expr
]
=
Nil
def
urf
(
expr
:
Expr
,
left
:
Int
)
:
Expr
=
{
def
urf
(
expr
:
Expr
,
left
:
Int
)
:
Expr
=
{
...
@@ -180,13 +194,13 @@ object Analysis {
...
@@ -180,13 +194,13 @@ object Analysis {
val
newExtra2
=
replace
(
substs
+
(
ResultVariable
()
->
newVar
),
post
)
val
newExtra2
=
replace
(
substs
+
(
ResultVariable
()
->
newVar
),
post
)
val
bigLet
=
(
newLetIDs
zip
args
).
foldLeft
(
And
(
newExtra1
,
newExtra2
))((
e
,
p
)
=>
Let
(
p
.
_1
,
p
.
_2
,
e
))
val
bigLet
=
(
newLetIDs
zip
args
).
foldLeft
(
And
(
newExtra1
,
newExtra2
))((
e
,
p
)
=>
Let
(
p
.
_1
,
p
.
_2
,
e
))
extras
=
urf
(
bigLet
,
t
-
1
)
::
extras
extras
=
urf
(
bigLet
,
t
-
1
)
::
extras
println
(
"*********************************"
)
//
println("*********************************")
println
(
bigLet
)
//
println(bigLet)
println
(
" --- from -----------------------"
)
//
println(" --- from -----------------------")
println
(
f
)
//
println(f)
println
(
" --- newVar is ------------------"
)
//
println(" --- newVar is ------------------")
println
(
newVar
)
//
println(newVar)
println
(
"*********************************"
)
//
println("*********************************")
newVar
newVar
}
else
{
}
else
{
val
bigLet
=
(
newLetIDs
zip
args
).
foldLeft
(
bodyWithLetVars
)((
e
,
p
)
=>
Let
(
p
.
_1
,
p
.
_2
,
e
))
val
bigLet
=
(
newLetIDs
zip
args
).
foldLeft
(
bodyWithLetVars
)((
e
,
p
)
=>
Let
(
p
.
_1
,
p
.
_2
,
e
))
...
@@ -203,7 +217,7 @@ object Analysis {
...
@@ -203,7 +217,7 @@ object Analysis {
}
}
val
finalE
=
urf
(
expression
,
times
)
val
finalE
=
urf
(
expression
,
times
)
(
finalE
,
extras
.
reverse
)
pulloutLets
(
Implies
(
And
(
extras
.
reverse
)
,
finalE
))
}
}
// Rewrites pattern matching expressions where the cases simply correspond to
// Rewrites pattern matching expressions where the cases simply correspond to
...
...
This diff is collapsed.
Click to expand it.
src/purescala/Trees.scala
+
28
−
0
View file @
33dd2e2b
...
@@ -405,6 +405,34 @@ object Trees {
...
@@ -405,6 +405,34 @@ object Trees {
searchAndApply
(
isLet
,
simplerLet
,
expr
)
searchAndApply
(
isLet
,
simplerLet
,
expr
)
}
}
/* Rewrites the expression so that all lets are at the top levels. */
def
pulloutLets
(
expr
:
Expr
)
:
Expr
=
{
val
(
storedLets
,
noLets
)
=
pulloutAndKeepLets
(
expr
)
rebuildLets
(
storedLets
,
noLets
)
}
def
pulloutAndKeepLets
(
expr
:
Expr
)
:
(
Seq
[(
Identifier
,
Expr
)],
Expr
)
=
{
var
storedLets
:
List
[(
Identifier
,
Expr
)]
=
Nil
val
isLet
=
((
t
:
Expr
)
=>
t
.
isInstanceOf
[
Let
])
def
storeLet
(
t
:
Expr
)
:
Expr
=
t
match
{
case
l
@
Let
(
i
,
e
,
b
)
=>
(
storedLets
=
((
i
,
e
))
::
storedLets
);
l
case
_
=>
t
}
def
killLet
(
t
:
Expr
)
:
Expr
=
t
match
{
case
l
@
Let
(
i
,
e
,
b
)
=>
b
case
_
=>
t
}
searchAndApply
(
isLet
,
storeLet
,
expr
)
val
noLets
=
searchAndApply
(
isLet
,
killLet
,
expr
)
(
storedLets
,
noLets
)
}
def
rebuildLets
(
lets
:
Seq
[(
Identifier
,
Expr
)],
expr
:
Expr
)
:
Expr
=
{
lets
.
foldLeft
(
expr
)((
e
,
p
)
=>
Let
(
p
.
_1
,
p
.
_2
,
e
))
}
/* Fully expands all let expressions. */
/* Fully expands all let expressions. */
def
expandLets
(
expr
:
Expr
)
:
Expr
=
{
def
expandLets
(
expr
:
Expr
)
:
Expr
=
{
def
rec
(
ex
:
Expr
,
s
:
Map
[
Identifier
,
Expr
])
:
Expr
=
ex
match
{
def
rec
(
ex
:
Expr
,
s
:
Map
[
Identifier
,
Expr
])
:
Expr
=
ex
match
{
...
...
This diff is collapsed.
Click to expand it.
src/purescala/Z3Solver.scala
+
39
−
39
View file @
33dd2e2b
...
@@ -139,46 +139,46 @@ class Z3Solver(reporter: Reporter) extends Solver(reporter) {
...
@@ -139,46 +139,46 @@ class Z3Solver(reporter: Reporter) extends Solver(reporter) {
// universally quantifies all functions !
// universally quantifies all functions !
if
(!
Settings
.
noForallAxioms
)
{
if
(!
Settings
.
noForallAxioms
)
{
import
Analysis.SimplePatternMatching
//
import Analysis.SimplePatternMatching
for
(
funDef
<-
program
.
definedFunctions
)
if
(
funDef
.
hasImplementation
&&
program
.
isRecursive
(
funDef
)
&&
funDef
.
args
.
size
>
0
)
{
//
for(funDef <- program.definedFunctions) if(funDef.hasImplementation && program.isRecursive(funDef) && funDef.args.size > 0) {
funDef
.
body
.
get
match
{
//
funDef.body.get match {
case
SimplePatternMatching
(
_
,
_
,
_
)
=>
reporter
.
info
(
"There's a good opportunity for a good axiomatization of "
+
funDef
.
id
.
name
)
//
case SimplePatternMatching(_,_,_) => reporter.info("There's a good opportunity for a good axiomatization of " + funDef.id.name)
case
_
=>
;
//
case _ => ;
}
//
}
val
argSorts
:
Seq
[
Z3Sort
]
=
funDef
.
args
.
map
(
vd
=>
typeToSort
(
vd
.
getType
).
get
)
//
val argSorts: Seq[Z3Sort] = funDef.args.map(vd => typeToSort(vd.getType).get)
val
boundVars
=
argSorts
.
zipWithIndex
.
map
(
p
=>
z3
.
mkBound
(
p
.
_2
,
p
.
_1
))
//
val boundVars = argSorts.zipWithIndex.map(p => z3.mkBound(p._2, p._1))
val
pattern
:
Z3Pattern
=
z3
.
mkPattern
(
functionDefToDef
(
funDef
)(
boundVars
:
_
*
))
//
val pattern: Z3Pattern = z3.mkPattern(functionDefToDef(funDef)(boundVars: _*))
val
nameTypePairs
=
argSorts
.
map
(
s
=>
(
z3
.
mkIntSymbol
(
nextIntForSymbol
()),
s
))
//
val nameTypePairs = argSorts.map(s => (z3.mkIntSymbol(nextIntForSymbol()), s))
val
fOfX
:
Expr
=
FunctionInvocation
(
funDef
,
funDef
.
args
.
map
(
_
.
toVariable
))
//
val fOfX: Expr = FunctionInvocation(funDef, funDef.args.map(_.toVariable))
val
toConvert
:
Expr
=
if
(
funDef
.
hasPrecondition
)
{
//
val toConvert: Expr = if(funDef.hasPrecondition) {
Implies
(
funDef
.
precondition
.
get
,
Equals
(
fOfX
,
funDef
.
body
.
get
))
//
Implies(funDef.precondition.get, Equals(fOfX, funDef.body.get))
}
else
{
//
} else {
Equals
(
fOfX
,
funDef
.
body
.
get
)
//
Equals(fOfX, funDef.body.get)
}
//
}
val
(
newExpr1
,
sideExprs1
)
=
Analysis
.
rewriteSimplePatternMatching
(
toConvert
)
//
val (newExpr1, sideExprs1) = Analysis.rewriteSimplePatternMatching(toConvert)
val
(
newExpr2
,
sideExprs2
)
=
(
newExpr1
,
Nil
)
// Analysis.inlineFunctionsAndContracts(program, newExpr1)
//
val (newExpr2, sideExprs2) = (newExpr1, Nil) // Analysis.inlineFunctionsAndContracts(program, newExpr1)
val
finalToConvert
=
if
(
sideExprs1
.
isEmpty
&&
sideExprs2
.
isEmpty
)
{
//
val finalToConvert = if(sideExprs1.isEmpty && sideExprs2.isEmpty) {
newExpr2
//
newExpr2
}
else
{
//
} else {
Implies
(
And
(
sideExprs1
++
sideExprs2
),
newExpr2
)
//
Implies(And(sideExprs1 ++ sideExprs2), newExpr2)
}
//
}
val
initialMap
:
Map
[
Identifier
,
Z3AST
]
=
Map
((
funDef
.
args
.
map
(
_
.
id
)
zip
boundVars
)
:_
*
)
//
val initialMap: Map[Identifier,Z3AST] = Map((funDef.args.map(_.id) zip boundVars):_*)
toZ3Formula
(
z3
,
finalToConvert
,
initialMap
)
match
{
//
toZ3Formula(z3, finalToConvert, initialMap) match {
case
Some
(
axiomTree
)
=>
{
//
case Some(axiomTree) => {
val
quantifiedAxiom
=
z3
.
mkForAll
(
0
,
List
(
pattern
),
nameTypePairs
,
axiomTree
)
//
val quantifiedAxiom = z3.mkForAll(0, List(pattern), nameTypePairs, axiomTree)
//z3.printAST(quantifiedAxiom)
//
//z3.printAST(quantifiedAxiom)
z3
.
assertCnstr
(
quantifiedAxiom
)
//
z3.assertCnstr(quantifiedAxiom)
}
//
}
case
None
=>
{
//
case None => {
reporter
.
warning
(
"Could not generate forall axiom for "
+
funDef
.
id
.
name
)
//
reporter.warning("Could not generate forall axiom for " + funDef.id.name)
reporter
.
warning
(
toConvert
)
//
reporter.warning(toConvert)
reporter
.
warning
(
newExpr1
)
//
reporter.warning(newExpr1)
reporter
.
warning
(
newExpr2
)
//
reporter.warning(newExpr2)
reporter
.
warning
(
finalToConvert
)
//
reporter.warning(finalToConvert)
}
//
}
}
//
}
}
//
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment