From 8270cd802c7552cf673cf3037fe0f11a6ef6b680 Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Thu, 25 Jun 2015 15:10:25 +0200
Subject: [PATCH] Imports should not contain units/ package objects
---
src/main/scala/leon/frontends/scalac/CodeExtraction.scala | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/scala/leon/frontends/scalac/CodeExtraction.scala b/src/main/scala/leon/frontends/scalac/CodeExtraction.scala
index cbdf4a6e2..557d95b8f 100644
--- a/src/main/scala/leon/frontends/scalac/CodeExtraction.scala
+++ b/src/main/scala/leon/frontends/scalac/CodeExtraction.scala
@@ -394,7 +394,11 @@ trait CodeExtraction extends ASTExtractors {
case _ => (selectors, false)
}
- val theDef = searchRelative(thePath.mkString("."), current).headOption
+ val theDef = searchRelative(thePath.mkString("."), current).find {
+ case _: UnitDef => false
+ case m: LeonModuleDef => !m.isPackageObject
+ case _ => true
+ }
(isWild, theDef) match {
case (true, Some(df)) => Some(WildcardImport(df))
--
GitLab