moved plugin Config to the reconstruction package

ikuraj · Aug 16, 2012 · 3e11b83 · 3e11b83
1 parent 32682c6
commit 3e11b83
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/....epfl.insynth/src/ch/epfl/insynth/core/completion/InsynthCompletionProposalComputer.scala b/....epfl.insynth/src/ch/epfl/insynth/core/completion/InsynthCompletionProposalComputer.scala
@@ -19,7 +19,6 @@ import scala.tools.nsc.util.Position
 import java.io.OutputStreamWriter
 import ch.epfl.insynth.InSynth
 import ch.epfl.insynth.util.TreePrinter
-import ch.epfl.insynth.Config
 import ch.epfl.insynth.env.InitialEnvironmentBuilder
 import ch.epfl.insynth.env.Declaration
 import ch.epfl.insynth.reconstruction.Output
@@ -35,7 +34,7 @@ TODO:
 */
 
 object InnerFinder extends ((ScalaCompilationUnit, Int) => Option[List[Output]]) with HasLogger {
-
+    
   var predefBuildLoader: PredefBuilderLoader = new PredefBuilderLoader()
 
   def apply(scu: ScalaCompilationUnit, position: Int): Option[List[Output]] = {
@@ -47,6 +46,8 @@ object InnerFinder extends ((ScalaCompilationUnit, Int) => Option[List[Output]])
 
     scu.withSourceFile {
       (sourceFile, compiler) =>
+
+        logger.info("InSynth working on source file: " + sourceFile.path)
 
         if (compiler != InSynthWrapper.compiler) {
           InSynthWrapper.compiler = compiler

diff --git a/ch.epfl.insynth.build/ch.epfl.insynth/src/ch/epfl/insynth/reconstruction/Config.scala b/ch.epfl.insynth.build/ch.epfl.insynth/src/ch/epfl/insynth/reconstruction/Config.scala
@@ -1,4 +1,4 @@
-package ch.epfl.insynth
+package ch.epfl.insynth.reconstruction
 
 import java.util.logging._
 

diff --git a/....insynth.build/ch.epfl.insynth/src/ch/epfl/insynth/reconstruction/codegen/Extractor.scala b/....insynth.build/ch.epfl.insynth/src/ch/epfl/insynth/reconstruction/codegen/Extractor.scala
@@ -1,7 +1,8 @@
 package ch.epfl.insynth.reconstruction.codegen
+
 import ch.epfl.insynth.reconstruction.intermediate._
 import ch.epfl.insynth.print._
-import ch.epfl.insynth.Config
+import ch.epfl.insynth.reconstruction.Config
 
 /**
  * class that extract the needed amount of snippets from the intermediate representation

diff --git a/...ynth.build/ch.epfl.insynth/src/ch/epfl/insynth/reconstruction/combinator/Combinator.scala b/...ynth.build/ch.epfl.insynth/src/ch/epfl/insynth/reconstruction/combinator/Combinator.scala
@@ -7,7 +7,7 @@ import java.util.logging.Logger
 import java.util.logging.ConsoleHandler
 import ch.epfl.insynth.env.FormatNode
 import java.util.logging.Level
-import ch.epfl.insynth.Config
+import ch.epfl.insynth.reconstruction.Config
 
 /**
  * object which application transforms an InSynth representation input

diff --git a/.../ch.epfl.insynth/src/ch/epfl/insynth/reconstruction/combinator/CombinatorStructures.scala b/.../ch.epfl.insynth/src/ch/epfl/insynth/reconstruction/combinator/CombinatorStructures.scala
@@ -10,7 +10,7 @@ import java.util.logging.Level
 import java.util.logging.ConsoleHandler
 import java.util.logging.FileHandler
 import java.util.logging.SimpleFormatter
-import ch.epfl.insynth.Config
+import ch.epfl.insynth.reconstruction.Config
 import ch.epfl.insynth.env.FormatNode
 
 // TODO set required combinations in each Tree node after we hit the limit in the top

diff --git a/...pfl.insynth/src/ch/epfl/insynth/reconstruction/intermediate/IntermediateTransformer.scala b/...pfl.insynth/src/ch/epfl/insynth/reconstruction/intermediate/IntermediateTransformer.scala
@@ -9,7 +9,7 @@ import ch.epfl.insynth.{ env => InSynthEnv }
 import ch.epfl.insynth.{trees => InSynth}
 import ch.epfl.scala.{trees => Scala}
 import scala.annotation.tailrec
-import ch.epfl.insynth.Config
+import ch.epfl.insynth.reconstruction.Config
 
 // logging
 import ch.epfl.scala.trees.FormatScalaType