Kkaye/include paths

src/source/Main.scala

@@ -16,14 +16,15 @@
 
 package djinni
 
-import java.io.{IOException, FileInputStream, InputStreamReader, File, BufferedWriter, FileWriter}
+import java.io.{IOException, FileNotFoundException, FileInputStream, InputStreamReader, File, BufferedWriter, FileWriter}
 
 import djinni.generatorTools._
 
 object Main {
 
   def main(args: Array[String]) {
     var idlFile: File = null
+    var idlIncludePaths: List[String] = List("")
     var cppOutFolder: Option[File] = None
     var cppNamespace: String = ""
     var cppIncludePrefix: String = ""
@@ -95,6 +96,8 @@ object Main {
       help("help")
       opt[File]("idl").valueName("<in-file>").required().foreach(idlFile = _)
         .text("The IDL file with the type definitions, typically with extension \".djinni\".")
+      opt[String]("idl-include-path").valueName("<path> ...").optional().unbounded().foreach(x => idlIncludePaths = idlIncludePaths :+ x)
+        .text("An include path to search for Djinni @import directives. Can specify multiple paths.")
       note("")
       opt[File]("java-out").valueName("<out-folder>").foreach(x => javaOutFolder = Some(x))
         .text("The output for the Java files (Generator disabled if unspecified).")
@@ -248,10 +251,10 @@ object Main {
       None
     }
     val idl = try {
-      (new Parser).parseFile(idlFile, inFileListWriter)
+      (new Parser(idlIncludePaths)).parseFile(idlFile, inFileListWriter)
     }
     catch {
-      case ex: IOException =>
+      case ex @ (_: FileNotFoundException | _: IOException) =>
         System.err.println("Error reading from --idl file: " + ex.getMessage)
         System.exit(1); return
     }

src/source/parser.scala

@@ -16,7 +16,7 @@
 
 package djinni
 
-import java.io.{File, InputStreamReader, FileInputStream, Writer}
+import java.io.{File, FileNotFoundException, InputStreamReader, FileInputStream, Writer}
 
 import djinni.ast.Interface.Method
 import djinni.ast.Record.DerivingType.DerivingType
@@ -26,32 +26,47 @@ import java.util.{Map => JMap}
 import org.yaml.snakeyaml.Yaml
 import scala.collection.JavaConversions._
 import scala.collection.mutable
+import scala.util.control.Breaks._
 import scala.util.parsing.combinator.RegexParsers
 import scala.util.parsing.input.{Position, Positional}
 
-case class Parser() {
+case class Parser(includePaths: List[String]) {
 
 val visitedFiles = mutable.Set[File]()
 val fileStack = mutable.Stack[File]()
 
 private object IdlParser extends RegexParsers {
   override protected val whiteSpace = """[ \t\n\r]+""".r
 
-  def idlFile(origin: String): Parser[IdlFile] = rep(importFile) ~ rep(typeDecl(origin)) ^^ { case imp~types => IdlFile(imp, types) }
-
-  def importFile: Parser[FileRef] = {
-
-	def fileParent:String = if (fileStack.top.getParent() != null) return fileStack.top.getParent() + "/" else return ""
+  def idlFile(origin: String): Parser[IdlFile] = rep(importFileRef) ~ rep(typeDecl(origin)) ^^ { case imp~types => IdlFile(imp, types) }
 
+  def importFileRef(): Parser[FileRef] = {
     ("@" ~> directive) ~ ("\"" ~> filePath <~ "\"") ^^ {
-      case "import" ~ x =>
-        val newPath = fileParent + x
-        new IdlFileRef(new File(newPath))
-      case "extern" ~ x =>
-        val newPath = fileParent + x
-        new ExternFileRef(new File(newPath))
+      case "import" ~ x => {
+        new IdlFileRef(importFile(x))
+      }
+      case "extern" ~ x => {
+        new ExternFileRef(importFile(x))
+      }
     }
   }
+
+  def importFile(fileName: String): File = {
+    var file: Option[File] = None
+
+    val path = includePaths.find(path => {
+      val relPath = if (path.isEmpty) fileStack.top.getParent() else path
+      val tmp = new File(relPath, fileName)
+      val exists = tmp.exists
+      if (exists) file = Some(tmp)
+      exists
+    })
+
+    if (file.isEmpty) throw new FileNotFoundException("Unable to find file \"" + fileName + "\" at " + fileStack.top.getCanonicalPath)
+
+    return file.get
+  }
+
   def filePath = "[^\"]*".r
 
   def directive = importDirective | externDirective

test-suite/djinni/all.djinni

@@ -1,4 +1,4 @@
 @import "common.djinni"
 
-@import "date.djinni"
-@import "duration.djinni"
+@import "vendor/third-party/date.djinni"
+@import "third-party/duration.djinni"

test-suite/generated-src/inFileList.txt

@@ -17,7 +17,7 @@ djinni/single_language_interfaces.djinni
 djinni/extended_record.djinni
 djinni/varnames.djinni
 djinni/relative_paths.djinni
-djinni/date.djinni
-djinni/date.yaml
-djinni/duration.djinni
-djinni/duration.yaml
+djinni/vendor/third-party/date.djinni
+djinni/vendor/third-party/date.yaml
+djinni/vendor/third-party/duration.djinni
+djinni/vendor/third-party/duration.yaml

test-suite/run_djinni.sh

@@ -123,6 +123,7 @@ fi
     --yaml-prefix "test_" \
     \
     --idl "$in_relative" \
+    --idl-include-path "djinni/vendor" \
 )
 
 # Make sure we can parse back our own generated YAML file