always include builtins path

4 files changed, 15 insertions, 12 deletions

diff --git a/TODO b/TODO
index 3ba421fa..1251064d 100644
--- a/TODO
+++ b/TODO
@@ -51,6 +51,7 @@ done:
 - compiler optimization: erease univ. pol. arguments of constructors
 - compiler optimization: erease univ. pol. arguments of case functions
 - compiler optimization: speed up 'eval' function
+- compiler put internals and prelude automaticly to include path when using compiler as a library
 - use less 'try' in parser
 - desugar node definitions
 - definitions are allowed in any order (not just bottom-up)
@@ -66,7 +67,6 @@ next:
 - editor: editor socket reconnection
 - editor: highlight errors in editor
 - release 0.4 compiler on hackage
-  - put internals and prelude automaticly to include path when using compiler as a library
   - sync getting started description with the example source code
 - blog about release:
   - few sentences about the past events
diff --git a/lambdacube-compiler.cabal b/lambdacube-compiler.cabal
index ee3bea97..83661eba 100644
--- a/lambdacube-compiler.cabal
+++ b/lambdacube-compiler.cabal
@@ -37,6 +37,8 @@ source-repository head
   location: https://github.com/lambdacube3d/lambdacube-compiler
 
 library
+  other-modules:
+    Paths_lambdacube_compiler
   exposed-modules:
     -- Compiler
     LambdaCube.Compiler
diff --git a/src/LambdaCube/Compiler.hs b/src/LambdaCube/Compiler.hs
index 7237ae12..e5496062 100644
--- a/src/LambdaCube/Compiler.hs
+++ b/src/LambdaCube/Compiler.hs
@@ -49,6 +49,9 @@ import LambdaCube.Compiler.Pretty hiding ((</>))
 import LambdaCube.Compiler.Infer (Infos, listInfos, ErrorMsg(..), PolyEnv(..), Export(..), Module(..), ErrorT, throwErrorTCM, parseLC, joinPolyEnvs, filterPolyEnv, inference_, ImportItems (..), Range(..), Exp, outputType, boolType, trueExp)
 import LambdaCube.Compiler.CoreToIR
 
+-- inlcude path for: Builtins, Internals and Prelude
+import Paths_lambdacube_compiler (getDataDir)
+
 type EName = String
 type MName = String
 
@@ -97,15 +100,16 @@ readFile' fname = do
     if b then Just <$> readFileStrict fname else return Nothing
 
 ioFetch :: MonadIO m => [FilePath] -> ModuleFetcher (MMT m)
-ioFetch paths imp n = f fnames
-  where
+ioFetch paths imp n = do
+  preludePath <- (</> "lc") <$> liftIO getDataDir
+  let
     f [] = throwErrorTCM $ "can't find module" <+> hsep (map text fnames)
     f (x:xs) = liftIO (readFile' x) >>= \case
         Nothing -> f xs
         Just src -> do
           --liftIO $ putStrLn $ "loading " ++ x
           return (x, src)
-    fnames = map normalise . concatMap lcModuleFile $ nub paths
+    fnames = map normalise . concatMap lcModuleFile $ nub $ preludePath : paths
     lcModuleFile path = (++ ".lc") <$> g imp
       where
         g Nothing = [path </> n]
@@ -115,6 +119,7 @@ ioFetch paths imp n = f fnames
         h acc [] = reverse acc
         h acc ('.':cs) = reverse acc </> h [] cs
         h acc (c: cs) = h (c: acc) cs
+  f fnames
 
 splitMPath fn = (joinPath as, intercalate "." $ bs ++ [y])
   where
diff --git a/tool/Compiler.hs b/tool/Compiler.hs
index 0723c0c8..215cf106 100644
--- a/tool/Compiler.hs
+++ b/tool/Compiler.hs
@@ -4,27 +4,23 @@ import Data.Aeson
 import qualified Data.ByteString.Lazy as B
 import System.FilePath
 
-import Paths_lambdacube_compiler (getDataDir)
 import LambdaCube.Compiler
 
 data Config
   = Config
   { srcName :: String
   , backend :: Backend
-  , sourceDir :: FilePath
+  , includePaths :: [FilePath]
   }
 
 sample :: Parser Config
 sample = Config
   <$> argument str (metavar "SOURCE_FILE")
   <*> flag OpenGL33 WebGL1 (long "webgl" <> help "generate WebGL 1.0 pipeline" )
-  <*> pure "/lc"
+  <*> pure ["."]
 
 main :: IO ()
-main = do
-  cabalDataDir <- getDataDir
-  cfg <- execParser opts
-  compile (cfg {sourceDir = cabalDataDir </> "lc"})
+main = compile =<< execParser opts
   where
     opts = info (helper <*> sample)
       ( fullDesc
@@ -36,7 +32,7 @@ compile Config{..} = do
   let dropExt n | takeExtension n == ".lc"  = dropExtension n
       dropExt n = n
       baseName = dropExt srcName
-  pplRes <- compileMain [".", sourceDir] backend baseName
+  pplRes <- compileMain includePaths backend baseName
   case pplRes of
     Left err -> putStrLn err
     Right ppl -> B.writeFile (baseName <> ".json") $ encode ppl