Merge pull request libdynd#453 from izaid/gfunc

Removed gfunc_callable_functions

Author: izaid

Diff for: CMakeLists.txt

@@ -182,7 +182,6 @@ set(pydynd_SRC
     dynd/include/do_import_array.hpp
     dynd/include/eval_context_functions.hpp
     dynd/include/exception_translation.hpp
-    dynd/include/gfunc_callable_functions.hpp
     dynd/include/git_version.hpp
     dynd/include/init.hpp
     dynd/include/numpy_interop.hpp
@@ -208,7 +207,6 @@ set(pydynd_SRC
     dynd/src/ctypes_interop.cpp
     dynd/src/eval_context_functions.cpp
     dynd/src/exception_translation.cpp
-    dynd/src/gfunc_callable_functions.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/dynd/src/git_version.cpp
     dynd/src/git_version.cpp.in
     dynd/src/init.cpp

Diff for: dynd/cpp/type.pxd

@@ -10,6 +10,8 @@ from .func.callable cimport callable
 
 cdef extern from 'dynd/types/base_type.hpp' namespace 'dynd::ndt' nogil:
     cdef cppclass base_type:
+        void get_dynamic_type_properties(map[string, callable] &)
+        void get_dynamic_type_functions(map[string, callable] &)
         void get_dynamic_array_properties(map[string, callable] &)
         void get_dynamic_array_functions(map[string, callable] &)
 
@@ -31,6 +33,7 @@ cdef extern from 'dynd/type.hpp' namespace 'dynd::ndt' nogil:
         type get_canonical_type()
 
         bool is_builtin()
+        bool is_null()
 
         bint operator==(type&)
         bint operator!=(type&)

Diff for: dynd/include/gfunc_callable_functions.hpp

@@ -2,6 +2,7 @@
 
 from cpython.object cimport Py_EQ, Py_NE
 from libc.stdint cimport intptr_t
+from libcpp.map cimport map
 from libcpp.string cimport string
 
 from ..cpp.types.type_id cimport (type_id_t, uninitialized_type_id,
@@ -24,24 +25,14 @@ from ..cpp.types.var_dim_type cimport dynd_make_var_dim_type
 from ..cpp.types.tuple_type cimport make_tuple as _make_tuple
 from ..cpp.types.struct_type cimport make_struct as _make_struct
 from ..cpp.types.callable_type cimport make_callable
+from ..cpp.func.callable cimport callable as _callable
 
 from ..config cimport translate_exception
 from ..wrapper cimport set_wrapper_type, wrap
 
 cdef extern from "numpy_interop.hpp" namespace "pydynd":
     object numpy_dtype_obj_from__type(_type&) except +translate_exception
 
-cdef extern from 'gfunc_callable_functions.hpp' namespace 'pydynd':
-    void add_type_names_to_dir_dict(_type&, object) except +translate_exception
-    object get__type_dynamic_property(_type&, object) except +translate_exception
-
-    # Function properties
-    cdef cppclass _type_callable_wrapper:
-        pass
-    object _type_callable_call(_type_callable_wrapper&, object, object) except +translate_exception
-
-    void init_w__type_callable_typeobject(object)
-
 cdef extern from 'type_functions.hpp' namespace 'pydynd':
     void init_w_type_typeobject(object)
 
@@ -219,7 +210,24 @@ cdef class type(object):
             return _type_get_type_id(self.v)
 
     def __getattr__(self, name):
-        return get__type_dynamic_property(self.v, name)
+        if self.v.is_null():
+            raise AttributeError(name)
+
+        cdef _callable p
+        cdef map[string, _callable] properties
+        cdef map[string, _callable] functions
+        cdef _callable f
+        if (not self.v.is_builtin()):
+            self.v.get().get_dynamic_type_properties(properties)
+            p = properties[name]
+            if (not p.is_null()):
+                return wrap(p(self.v))
+            self.v.get().get_dynamic_type_functions(functions)
+            f = functions[name]
+            if (not f.is_null()):
+                return wrap(f(self.v))
+
+        raise AttributeError(name)
 
     def __str__(self):
         return str(<char *>_type_str(self.v).c_str())
@@ -288,14 +296,6 @@ cdef type dynd_ndt_type_from_cpp(_type t):
 
 set_wrapper_type[_type](type)
 
-cdef class type_callable:
-    cdef _type_callable_wrapper v
-
-    def __call__(self, *args, **kwargs):
-        return _type_callable_call(self.v, args, kwargs)
-
-init_w__type_callable_typeobject(type_callable)
-
 class UnsuppliedType(object):
     pass