Merge branch 'master' of https://bitbucket.org/prosa16/ass3

src/App/Fontifier.hs

@@ -0,0 +1,40 @@
+{-# LANGUAGE TemplateHaskell #-}  -- needed for lenses
+
+module Fontifier (fontMap, fontify) where
+
+{----  Imports  ----}
+
+---- Brick, for markup specifications ----
+import           Brick.AttrMap (AttrMap, attrMap, attrName)
+import           Brick.Util    (bg, fg)
+import qualified Graphics.Vty  as Vty
+
+---- Various ----
+import           Lens.Micro
+import           Lens.Micro.TH (makeLenses)
+
+
+{---- Type Definitions ----}
+-- defines an attribute for a text slice
+data Fontification = FT { _ftStart :: Integer -- start index in string
+                        , _ftEnd   :: Integer -- end index in string
+                        , _ftAttr  :: String  -- attribute name
+                        }
+makeLenses ''Fontification
+
+{---- Functions ----}
+
+fontMap :: AttrMap
+fontMap = attrMap Vty.defAttr
+  [
+    (attrName "assignment" , fg Vty.blue),
+    (attrName "return"     , fg Vty.green),
+    (attrName "guard"      , fg Vty.yellow),
+    (attrName "err_braces" , fg Vty.red), -- unbalanced braces
+    (attrName "err_string" , fg Vty.red)  -- unterminated strings
+  ]
+
+-- calls the fontification functions
+-- and returns a list of attributes for text slices
+fontify :: String -> [Fontification]
+fontify s = []

src/App/Gui.hs

@@ -1,5 +1,4 @@
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TemplateHaskell   #-}
+{-# LANGUAGE TemplateHaskell #-} -- needed for lenses
 
 module Gui (runEditor) where
 
@@ -23,6 +22,9 @@ import           System.IO              (IOMode (..), hClose, hGetContents,
                                          openFile)
 import           System.Directory       (doesFileExist)
 
+---- Markup ----
+import qualified Fontifier              as Fontifier
+
 ---- Various ----
 import           Control.Monad.IO.Class (liftIO)
 import           Data.List
@@ -46,7 +48,6 @@ makeLenses ''HeditState
 
 
 
-
 {---- Functions ----}
 
 runEditor :: FilePath -> IO ()
@@ -79,7 +80,7 @@ theApp = App { appDraw         = drawUI
              , appChooseCursor = showFirstCursor
              , appHandleEvent  = appEvent
              , appStartEvent   = return
-             , appAttrMap      = const (attrMap Vty.defAttr [ ])
+             , appAttrMap      = const $ Fontifier.fontMap
              , appLiftVtyEvent = id
              }
 
@@ -115,14 +116,14 @@ appEvent st ev
 
 
 
--- TODO Refactor parts into SyntaxChecker.hs somehow
--- Rough idea:
--- 1) make some monad that carries kind of markup-info
---    state from one checker function to the next
--- 2) call checker functions in editor
--- 3) get (combined) markup-info from checkers
--- 4) apply markup-info in editor function
-
+-- TODO Refactor
+-- 1) Forget the monad thing that used to stand here, no need to
+--    introduce state
+-- 2) Rough idea:
+--      -> call Fontifier.fontify (public interface to whatever
+--                                 the fontification functions do)
+--      -> get list of attributes for text slices
+--      -> apply attributes to text in editor gui
 brackets :: [(Char,Char)]
 brackets = [('(',')'),('[',']'),('{','}')]
 

src/Main.hs

@@ -1,8 +1,16 @@
 module Main where
 
+import           Control.Monad      (when)
 import           Gui                (runEditor)
 import           System.Environment (getArgs)
 
 main = do
   args <- getArgs
+  when (null args) $ error (msgWithUsage "Please specify a file")
   runEditor $ head args
+
+msgWithUsage :: String -> String
+msgWithUsage = \x -> x ++ "\n" ++ usage
+
+usage :: String
+usage = "Usage: hedit <file>"