Rename PtrNamespace -> DictPtr and add other variants

Modelu wrapper and both wrapping PyObject

Author: Shimuuar

src/Python/Inline/Eval.hs

@@ -11,12 +11,13 @@ module Python.Inline.Eval
   , Namespace(..)
   , Main(..)
   , Temp(..)
+  , Dict(..)
+  , Module(..)
     -- ** Data types
   , Code
   , codeFromText
   , codeFromString
   , DictBinder
-
   ) where
 
 import Python.Internal.Types

src/Python/Internal/Eval.hs

@@ -33,7 +33,10 @@ module Python.Internal.Eval
   , Namespace(..)
   , Main(..)
   , Temp(..)
-  , PtrNamespace(..)
+  , Dict(..)
+  , DictPtr(..)
+  , Module(..)
+  , ModulePtr(..)
   , unsafeWithCode
   , eval
   , exec
@@ -687,9 +690,7 @@ class Namespace a where
 -- | Namespace for the top level code execution.
 data Main = Main
 
-
 instance Namespace Main where
-  -- NOTE: almost dupe of basicMainDict
   basicNamespaceDict _ =
     throwOnNULL =<< Py [CU.block| PyObject* {
       PyObject* main_module = PyImport_AddModule("__main__");
@@ -700,20 +701,49 @@ instance Namespace Main where
       return dict;
       }|]
 
+
 -- | Temporary namespace which get destroyed after execution
 data Temp = Temp
 
 instance Namespace Temp where
   basicNamespaceDict _ = basicNewDict
 
+
+-- | Newtype wrapper for bare python object. It's assumed to be a
+--   dictionary. This is not checked.
+newtype DictPtr = DictPtr (Ptr PyObject)
+
+instance Namespace DictPtr where
+  basicNamespaceDict (DictPtr p) = p <$ incref p
+
+
 -- | Newtype wrapper for bare python object. It's assumed to be a
 --   dictionary. This is not checked.
-newtype PtrNamespace = PtrNamespace (Ptr PyObject)
+newtype Dict = Dict PyObject
+
+instance Namespace Dict where
+  basicNamespaceDict (Dict d)
+    -- NOTE: We're incrementing counter inside bracket so we're safe.
+    = unsafeWithPyObject d (basicNamespaceDict . DictPtr)
+
+-- | Newtype wrapper over module object.
+newtype ModulePtr = ModulePtr (Ptr PyObject)
+
+instance Namespace ModulePtr where
+  basicNamespaceDict (ModulePtr p) = do
+    throwOnNULL =<< Py [CU.block| PyObject* {
+      PyObject* dict = PyModule_GetDict($(PyObject* p));
+      Py_XINCREF(dict);
+      return dict;
+      }|]
+
+-- | Newtype wrapper over module object.
+newtype Module = Module PyObject
 
-instance Namespace PtrNamespace where
-  basicNamespaceDict (PtrNamespace p) = do
-    Py [CU.block| void { Py_XINCREF($(PyObject* p)); } |]
-    return p
+instance Namespace Module where
+  basicNamespaceDict (Module d)
+    -- NOTE: We're incrementing counter inside bracket so we're safe.
+    = unsafeWithPyObject d (basicNamespaceDict . ModulePtr)
 
 
 -- | Evaluate python expression

src/Python/Internal/EvalQQ.hs

@@ -79,7 +79,7 @@ evaluatorPyf (PyQuote code binder) = runProgram $ do
   p_kwargs <- takeOwnership =<< progPy basicNewDict
   progPy $ do
     -- Create function in p_locals
-    exec Main (PtrNamespace p_locals) (PyQuote code mempty)
+    exec Main (DictPtr p_locals) (PyQuote code mempty)
     -- Look up function
     p_fun <- getFunctionObject p_locals >>= \case
       NULL -> throwM $ PyInternalError "_inline_python_ must be present"