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
cabb2c2a
Commit
cabb2c2a
authored
12 years ago
by
Etienne Kneuss
Browse files
Options
Downloads
Patches
Plain Diff
Remove unused binders
parent
224844ce
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/scala/leon/purescala/TreeOps.scala
+23
-7
23 additions, 7 deletions
src/main/scala/leon/purescala/TreeOps.scala
with
23 additions
and
7 deletions
src/main/scala/leon/purescala/TreeOps.scala
+
23
−
7
View file @
cabb2c2a
...
@@ -962,26 +962,26 @@ object TreeOps {
...
@@ -962,26 +962,26 @@ object TreeOps {
val
(
newExpr
,
newC
)
=
expr
match
{
val
(
newExpr
,
newC
)
=
expr
match
{
case
t
:
Terminal
=>
case
t
:
Terminal
=>
(
expr
,
c
tx
)
(
expr
,
c
In
)
case
UnaryOperator
(
e
,
builder
)
=>
case
UnaryOperator
(
e
,
builder
)
=>
val
(
e1
,
c
)
=
rec
(
e
,
ctx
)
val
(
e1
,
c
)
=
rec
(
e
,
ctx
)
val
newE
=
builder
(
e1
)
val
newE
=
builder
(
e1
)
(
newE
,
combiner
(
newE
,
c
tx
,
Seq
(
c
)))
(
newE
,
combiner
(
newE
,
c
In
,
Seq
(
c
)))
case
BinaryOperator
(
e1
,
e2
,
builder
)
=>
case
BinaryOperator
(
e1
,
e2
,
builder
)
=>
val
(
ne1
,
c1
)
=
rec
(
e1
,
ctx
)
val
(
ne1
,
c1
)
=
rec
(
e1
,
ctx
)
val
(
ne2
,
c2
)
=
rec
(
e2
,
ctx
)
val
(
ne2
,
c2
)
=
rec
(
e2
,
ctx
)
val
newE
=
builder
(
ne1
,
ne2
)
val
newE
=
builder
(
ne1
,
ne2
)
(
newE
,
combiner
(
newE
,
c
tx
,
Seq
(
c1
,
c2
)))
(
newE
,
combiner
(
newE
,
c
In
,
Seq
(
c1
,
c2
)))
case
NAryOperator
(
es
,
builder
)
=>
case
NAryOperator
(
es
,
builder
)
=>
val
(
nes
,
cs
)
=
es
.
map
(
e
=>
rec
(
e
,
ctx
)
)
.
unzip
val
(
nes
,
cs
)
=
es
.
map
{
rec
(
_
,
ctx
)
}
.
unzip
val
newE
=
builder
(
nes
)
val
newE
=
builder
(
nes
)
(
newE
,
combiner
(
newE
,
c
tx
,
cs
))
(
newE
,
combiner
(
newE
,
c
In
,
cs
))
case
e
=>
case
e
=>
sys
.
error
(
"Expression "
+
e
+
" ["
+
e
.
getClass
+
"] is not extractable"
)
sys
.
error
(
"Expression "
+
e
+
" ["
+
e
.
getClass
+
"] is not extractable"
)
...
@@ -1011,7 +1011,7 @@ object TreeOps {
...
@@ -1011,7 +1011,7 @@ object TreeOps {
def
simplePostTransform
(
post
:
Expr
=>
Expr
)(
expr
:
Expr
)
=
{
def
simplePostTransform
(
post
:
Expr
=>
Expr
)(
expr
:
Expr
)
=
{
val
newPost
=
(
e
:
Expr
,
c
:
Unit
)
=>
(
post
(
e
),
())
val
newPost
=
(
e
:
Expr
,
c
:
Unit
)
=>
(
post
(
e
),
())
genericTransform
[
Unit
]((
_
,
_
),
newPost
,
noCombiner
)(())(
expr
).
_1
genericTransform
[
Unit
]((
e
,
c
)
=>
(
e
,
None
),
newPost
,
noCombiner
)(())(
expr
).
_1
}
}
def
toDNF
(
e
:
Expr
)
:
Expr
=
{
def
toDNF
(
e
:
Expr
)
:
Expr
=
{
...
@@ -1176,7 +1176,23 @@ object TreeOps {
...
@@ -1176,7 +1176,23 @@ object TreeOps {
// "CC(a)" by "d" and not by "CC(b)"
// "CC(a)" by "d" and not by "CC(b)"
val
newThen
=
searchAndReplace
(
substMap
.
get
)(
then
)
val
newThen
=
searchAndReplace
(
substMap
.
get
)(
then
)
MatchExpr
(
scrutinee
,
Seq
(
SimpleCase
(
pattern
,
newThen
),
SimpleCase
(
WildcardPattern
(
None
),
elze
)))
// Remove unused binders
val
vars
=
variablesOf
(
newThen
)
def
simplerBinder
(
oid
:
Option
[
Identifier
])
=
oid
.
filter
(
vars
(
_
))
def
simplifyPattern
(
p
:
Pattern
)
:
Pattern
=
p
match
{
case
CaseClassPattern
(
ob
,
cd
,
subpatterns
)
=>
CaseClassPattern
(
simplerBinder
(
ob
),
cd
,
subpatterns
map
simplifyPattern
)
case
WildcardPattern
(
ob
)
=>
WildcardPattern
(
simplerBinder
(
ob
))
case
TuplePattern
(
ob
,
patterns
)
=>
TuplePattern
(
simplerBinder
(
ob
),
patterns
map
simplifyPattern
)
case
_
=>
p
}
MatchExpr
(
scrutinee
,
Seq
(
SimpleCase
(
simplifyPattern
(
pattern
),
newThen
),
SimpleCase
(
WildcardPattern
(
None
),
elze
)))
}
else
{
}
else
{
e
e
}
}
...
...
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