Merge pull request #14 from well-typed/edsko/delete-userprovided

Give up on trying to detect all anon declarations

Author: edsko

libclang-bindings.cabal

@@ -93,13 +93,11 @@ library
       Clang.HighLevel.Fold
       Clang.HighLevel.SourceLoc
       Clang.HighLevel.Tokens
-      Clang.HighLevel.UserProvided
       Clang.HighLevel.Wrappers
   build-depends:
       -- External dependencies
     , data-default  >= 0.7   && < 0.9
     , exceptions    >= 0.10  && < 0.11
-    , mtl           >= 2.2   && < 2.4
     , text          >= 1.2   && < 2.2
     , unliftio-core >= 0.2.1 && < 0.3
 

src/Clang/HighLevel.hs

@@ -41,8 +41,6 @@ module Clang.HighLevel (
   , clang_getDiagnostics
     -- * Folds
   , clang_visitChildren
-    -- * User-provided names
-  , clang_getCursorSpelling
     -- * Declaration classification
   , classifyDeclaration
   , classifyTentativeDefinition
@@ -58,5 +56,4 @@ import Clang.HighLevel.Diagnostics
 import Clang.HighLevel.Fold
 import Clang.HighLevel.SourceLoc
 import Clang.HighLevel.Tokens
-import Clang.HighLevel.UserProvided
 import Clang.HighLevel.Wrappers

src/Clang/HighLevel/Types.hs

@@ -40,8 +40,6 @@ module Clang.HighLevel.Types (
   , foldRecurseOpt
   , foldRecursePure
   , foldRecursePureOpt
-    -- * User-provided names
-  , CursorSpelling(..)
     -- * Declaration classification
   , DeclarationClassification(..)
   ) where
@@ -51,4 +49,3 @@ import Clang.HighLevel.Diagnostics
 import Clang.HighLevel.Fold
 import Clang.HighLevel.SourceLoc
 import Clang.HighLevel.Tokens
-import Clang.HighLevel.UserProvided

src/Clang/HighLevel/UserProvided.hs

@@ -14,7 +14,7 @@ module Clang.Internal.Results (
   , checkNotNull
   , ensureNotInRange
     -- * Auxiliary
-  , isNullPtr
+  , IsNullPtr(..)
   ) where
 
 import Control.Exception
@@ -76,12 +76,12 @@ ensureOn f p call = do
 
 -- | Ensure that a function did not return 'nullPtr' (indicating error)
 ensureNotNull ::
-     (HasCallStack, Coercible a (Ptr x), Show a)
+     (HasCallStack, IsNullPtr a, Show a)
   => IO a -> IO a
 ensureNotNull = ensure (not . isNullPtr)
 
 -- | If the result is 'nullPtr', return 'Nothing'
-checkNotNull :: Coercible a (Ptr x) => IO a -> IO (Maybe a)
+checkNotNull :: IsNullPtr a => IO a -> IO (Maybe a)
 checkNotNull call = do
     ptr <- call
     return $ if isNullPtr ptr
@@ -110,8 +110,11 @@ ensureNotInRange = ensureOn conv (not . simpleEnumInRange)
   Auxiliary
 -------------------------------------------------------------------------------}
 
-isNullPtr :: Coercible a (Ptr x) => a -> Bool
-isNullPtr ptr = ptr' == nullPtr
-  where
-    ptr' :: Ptr x
-    ptr' = coerce ptr
+class IsNullPtr a where
+  isNullPtr :: a -> Bool
+
+instance IsNullPtr (Ptr a) where
+  isNullPtr ptr = ptr' == nullPtr
+    where
+      ptr' :: Ptr x
+      ptr' = coerce ptr

src/Clang/Internal/Results.hs

@@ -208,6 +208,7 @@ module Clang.LowLevel.Core (
   , clang_CXRewriter_writeMainFileToStdOut
   , clang_CXRewriter_dispose
     -- * Auxiliary
+  , IsNullPtr(..)
   , nullCursor
   ) where
 
@@ -604,7 +605,7 @@ clang_getDiagnosticFixIt diagnostic fixit = liftIO $
 -- <https://clang.llvm.org/doxygen/group__CINDEX.html#gacdb7815736ca709ce9a5e1ec2b7e16ac>
 newtype CXTranslationUnit = CXTranslationUnit (Ptr ())
   deriving stock (Show)
-  deriving newtype (Storable)
+  deriving newtype (Storable, IsNullPtr)
 
 -- | An opaque type representing target information for a given translation
 -- unit.
@@ -1729,6 +1730,7 @@ clang_getCursorExtent cursor = liftIO $
 
 newtype CXToken = CXToken (Ptr ())
   deriving stock (Show)
+  deriving newtype (IsNullPtr)
 
 foreign import capi unsafe "clang_wrappers.h wrap_getToken"
   wrap_getToken :: CXTranslationUnit -> R CXSourceLocation_ -> IO CXToken

src/Clang/LowLevel/Core.hs

@@ -5,6 +5,8 @@ module Clang.LowLevel.Core.Pointers (
 
 import Foreign
 
+import Clang.Internal.Results
+
 {-------------------------------------------------------------------------------
   CXFile
 -------------------------------------------------------------------------------}
@@ -16,7 +18,7 @@ import Foreign
 -- <https://clang.llvm.org/doxygen/group__CINDEX__FILES.html#gacfcea9c1239c916597e2e5b3e109215a>
 newtype CXFile = CXFile (Ptr ())
   deriving stock (Show, Eq)
-  deriving newtype (Storable)
+  deriving newtype (Storable, IsNullPtr)
 
 {-------------------------------------------------------------------------------
   CXPrintingPolicy