Ensure source files are closed

closes GH-148
hrj · May 10, 2017 · bc67e00 · bc67e00
1 parent 0e40ce5
commit bc67e00
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/base/src/main/scala/co/uproot/abandon/Parser.scala b/base/src/main/scala/co/uproot/abandon/Parser.scala
@@ -295,8 +295,8 @@ class AbandonParser(inputPathOpt: Option[String]) extends StandardTokenParsers w
     new lexical.Scanner(reader)
   }
 
-  def scannerFromFile(filePath:String) = {
-    val reader= new PagedSeqReader(PagedSeq.fromFile(filePath))
+  def scannerFromSource(source:io.Source) = {
+    val reader= new PagedSeqReader(PagedSeq.fromIterator(source))
     new lexical.Scanner(reader)
   }
 }

diff --git a/base/src/main/scala/co/uproot/abandon/Process.scala b/base/src/main/scala/co/uproot/abandon/Process.scala
@@ -135,7 +135,7 @@ object Processor {
           case Some(source) =>
             val parser = new AbandonParser(Some(inputPath))
 
-            val parseResult = parser.abandon(Option(input.parentScope))(parser.scannerFromFile(inputPath))
+            val parseResult = parser.abandon(Option(input.parentScope))(parser.scannerFromSource(source))
             parseResult match {
               case parser.Success(scope, _) =>
                 val includes = filterByType[IncludeDirective](scope.entries)