e76d8b2 · typeable/yaml

git.iko.soy/typeable/yaml

on master help sign in

switched yaml decode function for config file readers to the one that supports 'include' syntax.

e76d8b2Alexey Kuleshevich10 years ago

Data/Yaml/Config.hs+2−1

@@ -41,6 +41,7 @@ import Control.Monad (forM)

41import Control.Exception (throwIO)

42import Data.Text.Encoding (encodeUtf8)

43import qualified Data.Yaml as Y

44+import qualified Data.Yaml.Include as YI

44import Data.Maybe (fromMaybe)

45import Data.Maybe (fromMaybe)

45import qualified Data.Text as T

46import qualified Data.Text as T

@@ -174,7 +175,7 @@ loadYamlSettings

174 -> IO settings

175 -> IO settings

175loadYamlSettings runTimeFiles compileValues envUsage = do

176loadYamlSettings runTimeFiles compileValues envUsage = do

176 runValues <- forM runTimeFiles $ \fp -> do

177 runValues <- forM runTimeFiles $ \fp -> do

177− eres <- Y.decodeFileEither fp

178+ eres <- YI.decodeFileEither fp

178 case eres of

179 case eres of

179 Left e -> do

180 Left e -> do

180 putStrLn $ "loadYamlSettings: Could not parse file as YAML: " ++ fp

181 putStrLn $ "loadYamlSettings: Could not parse file as YAML: " ++ fp