Merge branch 'master' into dev-unrelated

curly/curly.cabal

@@ -43,7 +43,7 @@ data-files:
 
 library
   default-language:    Haskell2010
-  exposed-modules:     Curly.Style, Curly.UI, Curly.Session, Curly.UI.Options, Curly.Session.Commands, Curly.Session.Commands.Repository, Curly.Session.Commands.Context, Curly.Session.Commands.Common, Curly.Session.Commands.Query, Curly.Session.Commands.Style, Curly.Session.Commands.Navigation, Curly.Session.Commands.Run, Curly.Session.Commands.Key, Language.Syntax.CmdArgs, Curly.Readline
+  exposed-modules:     Curly.Style, Curly.UI, Curly.Session, Curly.UI.Options, Curly.Session.Commands, Curly.Session.Commands.Repository, Curly.Session.Commands.Context, Curly.Session.Commands.Common, Curly.Session.Commands.Query, Curly.Session.Commands.Style, Curly.Session.Commands.Navigation, Curly.Session.Commands.Run, Curly.Session.Commands.Key, Language.Syntax.CmdArgs
   default-extensions:  RebindableSyntax
                        FlexibleInstances
                        MultiParamTypeClasses
@@ -57,9 +57,9 @@ library
                        TypeFamilies
                        LambdaCase
   other-extensions:    CPP, ExistentialQuantification, ViewPatterns, TypeFamilies, ScopedTypeVariables, RecursiveDo, DeriveGeneric, NoMonomorphismRestriction, QuasiQuotes, TemplateHaskell
-  build-depends: base >=4.9 && <4.10,curly-core >=0.7 && <0.8,curly-system >=0.3 && <0.4,deepseq >=1.4 && <1.5,definitive-base >=2.6 && <2.7,definitive-filesystem >=2.1 && <2.2,definitive-network >=1.4 && <1.5,definitive-parser >=2.5 && <2.6,directory >=1.3 && <1.4,filepath >=1.4 && <1.5,process >=1.4 && <1.5,terminal-size >=0.3 && <0.4,unix >=2.7 && <2.8, template-haskell
+  build-depends: base >=4.9 && <4.10,curly-core >=0.7 && <0.8,curly-system >=0.3 && <0.4,deepseq >=1.4 && <1.5,definitive-base >=2.6 && <2.7,definitive-filesystem >=2.1 && <2.2,definitive-network >=1.4 && <1.5,definitive-parser >=2.5 && <2.6,directory >=1.3 && <1.4,filepath >=1.4 && <1.5,process >=1.4 && <1.5,terminal-size >=0.3 && <0.4,unix >=2.7 && <2.8, hreadline, template-haskell
   hs-source-dirs:      src
-  
+
 executable curly
   default-language:    Haskell2010
   main-is: Curly.hs
@@ -77,5 +77,5 @@ executable curly
                        GeneralizedNewtypeDeriving
                        RankNTypes
                        TypeFamilies
-  build-depends: base >=4.9 && <4.10,curly >=0.59 && <0.60,curly-core >=0.7 && <0.8,curly-system >=0.3 && <0.4,deepseq >=1.4 && <1.5,definitive-base >=2.6 && <2.7,definitive-filesystem >=2.1 && <2.2,definitive-network >=1.4 && <1.5,definitive-parser >=2.5 && <2.6,directory >=1.3 && <1.4,filepath >=1.4 && <1.5,process >=1.4 && <1.5,unix >=2.7 && <2.8
+  build-depends: base >=4.9 && <4.10,curly >=0.59 && <0.60,curly-core >=0.7 && <0.8,curly-system >=0.3 && <0.4,deepseq >=1.4 && <1.5,definitive-base >=2.6 && <2.7,definitive-filesystem >=2.1 && <2.2,definitive-network >=1.4 && <1.5,definitive-parser >=2.5 && <2.6,directory >=1.3 && <1.4,filepath >=1.4 && <1.5,process >=1.4 && <1.5,unix >=2.7 && <2.8, hreadline
 

curly/doc/style.scss

@@ -24,7 +24,15 @@ body { width: 100%; }
     body { width: 65%; }
 }
 
+<<<<<<< HEAD
 body { margin: auto; font-family: 'Titillium Web'; line-height: 180%; font-size: 120%; }
+=======
+<<<<<<< Updated upstream
+body { margin: auto; font-family: 'Titillium Web'; line-height: 180%; }
+=======
+body { margin: auto; font-family: 'Titillium Web'; line-height: 180%; font-size: 1.6em; }
+>>>>>>> Stashed changes
+>>>>>>> master
 p, div, body { font-family: 'Titillium Web'; }
 p { text-indent: 0.7em; margin-left: 1em; }
 article { margin-left: 1em; margin-right: 1em; }

curly/src/Curly/Session.hs

@@ -22,7 +22,7 @@ import Data.IORef
 import GHC.IO.Handle (hSetBuffering,hClose,BufferMode(..))
 import IO.Filesystem
 import Language.Format
-import Curly.Readline (readline,addHistory,setCompletionEntryFunction)
+import Console.Readline (readline,addHistory,setCompletionEntryFunction)
 import System.Directory (removeFile)
 import System.Environment
 import System.Exit (exitSuccess)

hreadline/LICENSE

+../LICENSE
\ No newline at end of file

hreadline/hreadline.cabal

+-- Initial curly.cabal generated by cabal init.  For further documentation,
+--  see http://haskell.org/cabal/users-guide/
+
+name:                hreadline
+version:             0.2
+synopsis:            A Readline clone in pure Haskell
+-- description:         
+license:             GPL-3
+license-file:        LICENSE
+author:              Marc Coiffier
+maintainer:          marc.coiffier@univ-grenoble-alpes.fr
+-- copyright:           
+category:            Compilers
+build-type:          Simple
+cabal-version:       >=1.10
+homepage: http://www.curly-lang.org/
+
+library
+  default-language:    Haskell2010
+  exposed-modules:     Console.Readline
+  default-extensions:  RebindableSyntax
+                       FlexibleInstances
+                       MultiParamTypeClasses
+                       FlexibleContexts
+                       FunctionalDependencies
+                       TypeOperators
+                       TupleSections
+                       ImplicitParams
+                       GeneralizedNewtypeDeriving
+                       RankNTypes
+                       TypeFamilies
+                       LambdaCase
+  build-depends: base >=4.9 && <4.10,deepseq,definitive-base,definitive-parser,terminal-size,template-haskell
+  hs-source-dirs:      src

curly/src/Curly/Readline.hs → hreadline/src/Console/Readline.hs

 {-# LANGUAGE TypeFamilies, PatternSynonyms #-}
-module Curly.Readline (readline,addHistory,setCompletionEntryFunction) where
+module Console.Readline (readline,addHistory,setCompletionEntryFunction) where
 
 import Definitive
 import Language.Parser

stack.yaml

@@ -40,6 +40,7 @@ packages:
 - definitive-parser
 - definitive-network
 - definitive-filesystem
+- hreadline
 - curly-kademlia
 - curly-core
 - curly-system