Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lisa
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
lisa
Commits
8faa4ec1
Commit
8faa4ec1
authored
2 years ago
by
Katja Goltsova
Browse files
Options
Downloads
Patches
Plain Diff
Print and/or connector formulas with 1 argument
parent
a4c9481b
No related branches found
No related tags found
1 merge request
!65
Print and/or connector formulas with 1 argument
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lisa-utils/src/main/scala/lisa/utils/Parser.scala
+1
-0
1 addition, 0 deletions
lisa-utils/src/main/scala/lisa/utils/Parser.scala
lisa-utils/src/test/scala/lisa/utils/PrinterTest.scala
+9
-0
9 additions, 0 deletions
lisa-utils/src/test/scala/lisa/utils/PrinterTest.scala
with
10 additions
and
0 deletions
lisa-utils/src/main/scala/lisa/utils/Parser.scala
+
1
−
0
View file @
8faa4ec1
...
@@ -460,6 +460,7 @@ object Parser {
...
@@ -460,6 +460,7 @@ object Parser {
},
},
{
{
case
ConnectorFormula
(
c
@
(
Iff
|
Implies
),
Seq
(
left
,
right
))
=>
Seq
(
left
~
Some
(
c
~
right
))
case
ConnectorFormula
(
c
@
(
Iff
|
Implies
),
Seq
(
left
,
right
))
=>
Seq
(
left
~
Some
(
c
~
right
))
case
ConnectorFormula
((
And
|
Or
),
Seq
(
f
))
=>
Seq
(
f
~
None
)
case
f
=>
Seq
(
f
~
None
)
case
f
=>
Seq
(
f
~
None
)
}
}
)
)
...
...
This diff is collapsed.
Click to expand it.
lisa-utils/src/test/scala/lisa/utils/PrinterTest.scala
+
9
−
0
View file @
8faa4ec1
...
@@ -98,6 +98,15 @@ class PrinterTest extends AnyFunSuite with TestUtils {
...
@@ -98,6 +98,15 @@ class PrinterTest extends AnyFunSuite with TestUtils {
assert
(
Parser
.
printFormula
(
ConnectorFormula
(
Or
,
Seq
(
ConnectorFormula
(
Or
,
Seq
(
a
,
b
)),
c
)))
==
"a ∨ b ∨ c"
)
assert
(
Parser
.
printFormula
(
ConnectorFormula
(
Or
,
Seq
(
ConnectorFormula
(
Or
,
Seq
(
a
,
b
)),
c
)))
==
"a ∨ b ∨ c"
)
}
}
test
(
"and/or of 1 argument"
)
{
assert
(
Parser
.
printFormula
(
ConnectorFormula
(
And
,
Seq
(
a
)))
==
"a"
)
assert
(
Parser
.
printFormula
(
ConnectorFormula
(
Or
,
Seq
(
a
)))
==
"a"
)
assert
(
Parser
.
printFormula
(
ConnectorFormula
(
Implies
,
Seq
(
ConnectorFormula
(
Or
,
Seq
(
a
)),
ConnectorFormula
(
And
,
Seq
(
a
)))))
==
"(a) ⇒ (a)"
)
assert
(
Parser
.
printFormula
(
ConnectorFormula
(
Implies
,
Seq
(
a
,
a
)))
==
"a ⇒ a"
)
assert
(
Parser
.
printFormula
(
BinderFormula
(
Forall
,
x
,
ConnectorFormula
(
Or
,
Seq
(
a
))))
==
"∀'x. a"
)
}
test
(
"connectors of >2 arguments"
)
{
test
(
"connectors of >2 arguments"
)
{
assert
(
Parser
.
printFormula
(
ConnectorFormula
(
And
,
Seq
(
a
,
b
,
c
)))
==
"a ∧ b ∧ c"
)
assert
(
Parser
.
printFormula
(
ConnectorFormula
(
And
,
Seq
(
a
,
b
,
c
)))
==
"a ∧ b ∧ c"
)
assert
(
Parser
.
printFormula
(
ConnectorFormula
(
Or
,
Seq
(
a
,
b
,
c
)))
==
"a ∨ b ∨ c"
)
assert
(
Parser
.
printFormula
(
ConnectorFormula
(
Or
,
Seq
(
a
,
b
,
c
)))
==
"a ∨ b ∨ c"
)
...
...
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