[ #8 ] Fix compilation

appveyor.yml

@@ -20,4 +20,5 @@ test_script:
 - stack setup
 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
 # descriptor
-- echo "" | stack --no-terminal install
+# - echo "" | stack --no-terminal test
+- echo "" | stack install

src/full/OwO/Syntax/Abstract.hs

@@ -67,8 +67,11 @@ data QName = QName
   , concretName :: Name
   } deriving (Eq, Generic, Ord, Show)
 
-simpleName :: QName -> T.Text
-simpleName = textOfName . nameConcrete . concretName
+simpleQName :: QName -> T.Text
+simpleQName = C.textOfName . nameConcrete . concretName
+
+simpleName :: Name -> T.Text
+simpleName = C.textOfName . nameConcrete
 
 -- | Program Structure Item: File
 data PsiFile = PsiFile

src/full/OwO/Syntax/Concret.hs

@@ -21,7 +21,7 @@ import           GHC.Generics        (Generic)
     in different locations are equal.
 -}
 data Name
-  = Name   Loc Text   -- ^ A identifier.
+  = Name   Loc T.Text   -- ^ A identifier.
   | NoName Loc NameId -- ^ @_@.
   deriving (Generic, Ord, Show)
 

src/full/OwO/TypeChecking/Monad.hs

@@ -46,16 +46,16 @@ lookupCtxWithName currentModule name ctx =
   Map.lookup currentModule ctx >>= Map.lookup name
 
 lookupCtx :: QName -> TCCtx a -> Maybe a
-lookupCtx (QName currentModule name) = lookupCtxWithName currentModule $ nameConcret name
+lookupCtx (QName currentModule name) = lookupCtxWithName currentModule $ simpleName name
 
 -- | Overwriting
 addDefinitionWithName :: QModuleName -> TextName -> a -> TCCtx a -> TCCtx a
 addDefinitionWithName targetModule name a ctx = fromMaybe ctx $
   (\ modifiedCtx -> Map.insert targetModule modifiedCtx ctx) <$>
   Map.insert name a <$> Map.lookup targetModule ctx
 
-addDefinition :: QName -> a -> TCCtx a -> Maybe a
-addDefinition (QName currentModule name) = lookupCtxWithName currentModule $ nameConcret name  
+addDefinition :: QName -> a -> TCCtx a -> TCCtx a
+addDefinition (QName currentModule name) = addDefinitionWithName currentModule $ simpleName name
 
 -- | TypeChecking State. I haven't decide on whether to store warnings here
 --   (but errors should definitely be in the other side of the Monad)