From a68a74847660684bbdef7d435009a9865fbd4e1d Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Thu, 25 Jun 2015 15:10:47 +0200
Subject: [PATCH] Fix imported defs by package
---
src/main/scala/leon/purescala/Definitions.scala | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/scala/leon/purescala/Definitions.scala b/src/main/scala/leon/purescala/Definitions.scala
index 575939a8c..1e38c2983 100644
--- a/src/main/scala/leon/purescala/Definitions.scala
+++ b/src/main/scala/leon/purescala/Definitions.scala
@@ -111,8 +111,16 @@ object Definitions {
def importedDefs(implicit pgm: Program) = this match {
case PackageImport(pack) =>
- // Ignore standalone modules, assume there are extra imports for them
- DefOps.unitsInPackage(pgm, pack)
+ for {
+ u <- DefOps.unitsInPackage(pgm, pack)
+ d <- u.subDefinitions
+ ret <- d match {
+ case m: ModuleDef if m.isPackageObject =>
+ m.subDefinitions
+ case other =>
+ Seq(other)
+ }
+ } yield ret
case SingleImport(imported) =>
List(imported)
--
GitLab