Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implement some new propagation strategies #79

Draft
wants to merge 40 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
00fbc3f
merge with trunk
pruemmer Jul 1, 2022
671450e
merge with trunk, fixed compilation problems
pruemmer Jul 1, 2022
2b5e5b5
Merge branch 'master' into scala-2.13
pruemmer Jul 30, 2022
4bcad8f
merge with master
pruemmer Nov 3, 2022
5ae2f63
Merge branch 'master' into scala-2.13
pruemmer Nov 4, 2022
074e188
merge with master
pruemmer Jun 28, 2023
1e65ecb
merge with master
pruemmer Jul 5, 2023
d933770
adaptation to Scala 2.13
pruemmer Jul 5, 2023
83ba8ec
Merge branch 'master' into scala-2.13
pruemmer Jul 5, 2023
02990c8
Merge branch 'master' into scala-2.13
pruemmer Jul 10, 2023
9a85458
Merge branch 'master' into scala-2.13
pruemmer Jul 14, 2023
6a01b9a
Merge branch 'master' into scala-2.13
pruemmer Jul 19, 2023
6766e87
Merge branch 'master' into scala-2.13
pruemmer Jul 25, 2023
6ebcc01
Merge branch 'master' into scala-2.13
pruemmer Dec 12, 2023
561774d
implement some new propagation strategies
OliverMa1 Jan 11, 2024
7fc6efe
local merge
OliverMa1 Jan 11, 2024
631a843
add new tests for propagation
OliverMa1 Jan 11, 2024
f9753e2
add new flag to run backward only as main goal
OliverMa1 Jan 11, 2024
4f49e5c
add missing flag condition
OliverMa1 Jan 11, 2024
fdf0b93
Merge branch 'master' into scala-2.13
pruemmer Jan 12, 2024
3a2a834
Merge branch 'master' into forward-propagation
pruemmer Jan 12, 2024
bc535d3
fixed typo
pruemmer Jan 12, 2024
3d04af0
Merge branch 'master' of https://github.com/uuverifiers/ostrich into …
OliverMa1 Jan 24, 2024
1611f14
merge with master
pruemmer Jan 24, 2024
582d6c2
Merge branch 'master' of https://github.com/uuverifiers/ostrich into …
OliverMa1 Jan 26, 2024
c841f30
Merge branch 'master' of https://github.com/uuverifiers/ostrich into …
OliverMa1 Jan 26, 2024
ab1912f
move some tests around
OliverMa1 Jan 26, 2024
1a9c975
Merge branch 'master' into scala-2.13
pruemmer Mar 5, 2024
01b0600
Merge branch 'master' into scala-2.13
pruemmer Mar 7, 2024
df7b6ce
Merge branch 'master' into scala-2.13
pruemmer May 21, 2024
3668626
Merge branch 'master' of https://github.com/uuverifiers/ostrich into …
OliverMa1 May 21, 2024
4030240
move some tests around
OliverMa1 May 21, 2024
0723a30
versions
pruemmer May 23, 2024
e8263ba
Merge branch 'master' into scala-2.13
pruemmer May 23, 2024
39c0e93
version
pruemmer May 27, 2024
9e3885d
Merge branch 'master' into scala-2.13
pruemmer May 28, 2024
8577f3b
Merge branch 'master' of https://github.com/uuverifiers/ostrich into …
OliverMa1 May 29, 2024
9be99d4
change timeout
OliverMa1 May 29, 2024
3b88e0a
add RCP to portfolio
OliverMa1 May 29, 2024
1cb4334
Merge branch 'scala-2.13' of https://github.com/uuverifiers/ostrich i…
OliverMa1 Jun 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
lazy val commonSettings = Seq(
name := "ostrich",
organization := "uuverifiers",
version := "1.3.5",
version := "1.4pre",
//
homepage := Some(url("https://github.com/uuverifiers/ostrich")),
licenses := Seq("BSD-3-Clause" -> url("https://opensource.org/licenses/BSD-3-Clause")),
Expand Down Expand Up @@ -49,9 +49,9 @@ lazy val commonSettings = Seq(
)
),
//
scalaVersion := "2.11.12",
crossScalaVersions := Seq("2.11.12", "2.12.17"),
scalaVersion := "2.13.14",
scalacOptions += "-deprecation",
scalacOptions += "-Wunused",
fork in run := true,
cancelable in Global := true,
//
Expand Down
2 changes: 1 addition & 1 deletion ostrich
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ostrichParams=""

for p; do
case "$p" in
[+-]eager | [+-]forward | -length=* | [+-]minimizeAutomata | [+-]parikh | -regexTranslator=*)
[+-]eager | [+-]forward | -length=* | [+-]minimizeAutomata | [+-]parikh | -regexTranslator=* | [+-]backwardOnly | [+-]forwardOnly | [+-]forwardBackward)
if [ x"$ostrichParams" = x"" ]; then
ostrichParams=$p
else
Expand Down
8 changes: 7 additions & 1 deletion src/main/scala/ostrich/ECMARegexParser.scala
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,18 @@ import ecma2020regex._
import ecma2020regex.Absyn._
import ecma2020regex.Absyn.{Quantifier => ECMAQuantifier}

import scala.collection.JavaConversions.{asScalaBuffer, asScalaIterator}
import scala.collection.JavaConverters.asScala

object ECMARegexParser {

val OctalEscape = """[0-7]{1,3}""".r

implicit def impToScalaList[A](l : java.util.List[A]) : Seq[A] =
asScala(l).toSeq

implicit def impToScalaIterator[A](l : java.util.Iterator[A]) : Iterator[A] =
asScala(l)

val UnsupportedFlag = """[^ius]""".r

}
Expand Down
Loading
Loading