From 8347b480d8a148c5697e384fe86f74575cf5cdee Mon Sep 17 00:00:00 2001
From: Etienne Kneuss <ekneuss@gmail.com>
Date: Fri, 12 Jun 2015 01:23:08 +0200
Subject: [PATCH] Fix Leon strings being always empty
---
library/lang/string/package.scala | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/library/lang/string/package.scala b/library/lang/string/package.scala
index ba2e37e0a..f09af7c6e 100644
--- a/library/lang/string/package.scala
+++ b/library/lang/string/package.scala
@@ -3,11 +3,22 @@
package leon.lang
import leon.annotation._
+import leon.collection._
import scala.language.implicitConversions
+import scala.collection.immutable.{List => ScalaList}
+
package object string {
@ignore
implicit def strToStr(s: java.lang.String): leon.lang.string.String = {
- String(leon.collection.Nil())
+ String(listToList(s.toList))
+ }
+
+ @ignore
+ def listToList[A](s: ScalaList[A]): List[A] = s match {
+ case h :: t =>
+ Cons(h, listToList(t))
+ case _ =>
+ Nil[A]()
}
}
--
GitLab