diff --git a/src/Ubc/Parse/Syntax/Enumeration.hs b/src/Ubc/Parse/Syntax/Enumeration.hs index d891217..bcba92a 100644 --- a/src/Ubc/Parse/Syntax/Enumeration.hs +++ b/src/Ubc/Parse/Syntax/Enumeration.hs @@ -3,9 +3,11 @@ module Ubc.Parse.Syntax.Enumeration , parse ) where -import qualified Ubc.Parse.Syntax.Language as UbcLanguage + import Text.Parsec (ParsecT, many, ()) +import qualified Ubc.Parse.Syntax.Language as UbcLanguage + type EnumerationMember = String data Enumeration = Enumeration { name :: String @@ -19,5 +21,5 @@ parse = do identifier <- UbcLanguage.identifier "enum identifier" values <- UbcLanguage.braces $ many UbcLanguage.identifier - return $ Enumeration identifier values + return $! Enumeration identifier values diff --git a/src/Ubc/Parse/Syntax/File.hs b/src/Ubc/Parse/Syntax/File.hs index 2ee3026..e83f507 100644 --- a/src/Ubc/Parse/Syntax/File.hs +++ b/src/Ubc/Parse/Syntax/File.hs @@ -6,7 +6,10 @@ module Ubc.Parse.Syntax.File ) where +import GHC.Generics (Generic, Generically(..)) + import Control.Monad ((<$!>)) +import Data.Functor ((<&>)) import Text.Parsec (choice, ParsecT, many) @@ -19,8 +22,6 @@ import qualified Ubc.Parse.Syntax.Struct as Struct import qualified Ubc.Parse.Syntax.Function as Function import qualified Ubc.Parse.Syntax.Statement as Statement import qualified Ubc.Parse.Syntax.Enumeration as Enumeration -import GHC.Generics (Generic, Generically(..)) -import Data.Functor ((<&>)) data File = File { name :: String diff --git a/stack.yaml b/stack.yaml index bf27fc6..33f7bce 100644 --- a/stack.yaml +++ b/stack.yaml @@ -40,6 +40,8 @@ packages: # commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a # # extra-deps: [] +extra-deps: +- hoogle-5.0.18.4 # Override default flag values for project packages and extra-deps # flags: {} diff --git a/stack.yaml.lock b/stack.yaml.lock index b4a1752..1630d61 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -3,5 +3,12 @@ # For more information, please see the documentation at: # https://docs.haskellstack.org/en/stable/topics/lock_files -packages: [] +packages: +- completed: + hackage: hoogle-5.0.18.4@sha256:aaf0274da7de4e31ade69ad09f57a59ee25b3765cd102e631629850521754984,3333 + pantry-tree: + sha256: 62d0ccb848ecd2b8f29dc782e3d0a9bde57fa626f09e800822229965728f476c + size: 3414 + original: + hackage: hoogle-5.0.18.4 snapshots: [] diff --git a/ubcc.cabal b/ubcc.cabal index ace0687..738d7ab 100644 --- a/ubcc.cabal +++ b/ubcc.cabal @@ -30,6 +30,7 @@ library Ubc.Parse.Syntax.Expression Ubc.Parse.Syntax.File Ubc.Parse.Syntax.Function + Ubc.Parse.Syntax.Import Ubc.Parse.Syntax.Language Ubc.Parse.Syntax.Operators Ubc.Parse.Syntax.Statement