Moved ndt_typ_from_pylist out of the type_conversions files.

Added a comment block about the purposes of the conversion files.

Author: insertinterestingnamehere

dynd/include/array_conversions.hpp

@@ -1,3 +1,23 @@
+//
+// Copyright (C) 2011-16 DyND Developers
+// BSD 2-Clause License, see LICENSE.txt
+//
+
+/* This file exists to expose whatever functionality from
+ * nd/array.pyx and nd/callable.pyx needs to be available
+ * in the C++ portions of the codebase.
+ * Currently it exists only as a means of
+ * exporting conversions between the Cython wrapper
+ * types and their corresponding C++ types.
+ * Those conversions must be exported from Cython
+ * to the C++ code since the ABI for the wrapper types
+ * must be defined there (and depends on Cython's ABI for
+ * extension types).
+ *
+ * The conversions defined here lazily load the modules
+ * that expose the core ABI for the wrapper types.
+*/
+
 #pragma once
 
 #include <Python.h>

dynd/include/type_conversions.hpp

@@ -1,7 +1,22 @@
 //
-// Copyright (C) 2011-15 DyND Developers
+// Copyright (C) 2011-16 DyND Developers
 // BSD 2-Clause License, see LICENSE.txt
 //
+
+/* This file exists to expose whatever functionality from
+ * ndt/type.pyx needs to be available throughout the
+ * C++ codebase. Currently it exists only as a means
+ * of providing conversions between the Cython wrapper
+ * types and their corresponding C++ types.
+ * Those conversions must be exported from Cython
+ * to the C++ code since the ABI for the wrapper types
+ * must be defined there (and depends on Cython's ABI for
+ * extension types).
+ *
+ * The conversions defined here lazily load the modules
+ * that expose the core ABI for the wrapper types.
+*/
+
 #pragma once
 
 #include <Python.h>
@@ -17,6 +32,5 @@ PYDYND_API PyTypeObject *get_type_pytypeobject();
 PYDYND_API PyObject *type_from_cpp(const dynd::ndt::type &);
 PYDYND_API dynd::ndt::type dynd_ndt_as_cpp_type(PyObject *);
 PYDYND_API dynd::ndt::type dynd_ndt_cpp_type_for(PyObject *);
-PYDYND_API dynd::ndt::type ndt_type_from_pylist(PyObject *);
 
 } // namespace pydynd

dynd/include/type_deduction.hpp

@@ -161,4 +161,6 @@ void register_nd_array_type_deduction(PyTypeObject *, dynd::ndt::type (*)(PyObje
 
 PYDYND_API dynd::ndt::type xtype_for_prefix(PyObject *obj);
 
+PYDYND_API dynd::ndt::type ndt_type_from_pylist(PyObject *);
+
 } // namespace pydynd

dynd/src/type_conversions.cpp

@@ -1,8 +1,4 @@
-#include <cstdint>
-
-#include "type_functions.hpp"
-
-#include "type_deduction.hpp"
+#include "type_conversions.hpp"
 
 #include "type_api.h"
 
@@ -68,22 +64,3 @@ dynd::ndt::type pydynd::dynd_ndt_cpp_type_for(PyObject *o)
   }
   return cpp_type_for(o);
 }
-
-dynd::ndt::type pydynd::ndt_type_from_pylist(PyObject *obj)
-{
-  // TODO: Add ability to specify access flags (e.g. immutable)
-  // Do a pass through all the data to deduce its type and shape
-  std::vector<intptr_t> shape;
-  dynd::ndt::type tp = dynd::ndt::make_type<void>();
-  Py_ssize_t size = PyList_GET_SIZE(obj);
-  shape.push_back(size);
-  for (Py_ssize_t i = 0; i < size; ++i) {
-    deduce_pylist_shape_and_dtype(PyList_GET_ITEM(obj, i), shape, tp, 1);
-  }
-
-  if (tp.get_id() == dynd::void_id) {
-    tp = dynd::ndt::make_type<int32_t>();
-  }
-
-  return dynd::ndt::make_type(shape.size(), shape.data(), tp);
-}

dynd/src/type_deduction.cpp

@@ -323,3 +323,22 @@ dynd::ndt::type pydynd::xtype_for_prefix(PyObject *obj)
 
   return dynd::ndt::type();
 }
+
+dynd::ndt::type pydynd::ndt_type_from_pylist(PyObject *obj)
+{
+  // TODO: Add ability to specify access flags (e.g. immutable)
+  // Do a pass through all the data to deduce its type and shape
+  std::vector<intptr_t> shape;
+  dynd::ndt::type tp = dynd::ndt::make_type<void>();
+  Py_ssize_t size = PyList_GET_SIZE(obj);
+  shape.push_back(size);
+  for (Py_ssize_t i = 0; i < size; ++i) {
+    deduce_pylist_shape_and_dtype(PyList_GET_ITEM(obj, i), shape, tp, 1);
+  }
+
+  if (tp.get_id() == dynd::void_id) {
+    tp = dynd::ndt::make_type<int32_t>();
+  }
+
+  return dynd::ndt::make_type(shape.size(), shape.data(), tp);
+}