array module support: fromfile()

pythran/pythonic/array/array.hpp

@@ -17,7 +17,7 @@ namespace array
     types::array<typename details::typecodes<c>::type>
     array(std::integral_constant<char, c>)
     {
-      return {};
+      return types::empty_list{};
     }
 
     template <char c, class E>

pythran/pythonic/array/array/fromfile.hpp

@@ -0,0 +1,27 @@
+#ifndef PYTHONIC_ARRAY_ARRAY_FROMFILE_HPP
+#define PYTHONIC_ARRAY_ARRAY_FROMFILE_HPP
+
+#include "pythonic/include/types/array.hpp"
+#include "pythonic/include/utils/functor.hpp"
+
+PYTHONIC_NS_BEGIN
+
+namespace array
+{
+
+  namespace array
+  {
+
+    template <class T>
+    types::none_type fromfile(types::array<T> &seq, types::file &f, long n)
+    {
+      long p = seq.size();
+      seq.resize(p + n);
+      f.read_as(n, &*seq.begin() + p);
+      return {};
+    }
+
+  } // namespace array
+} // namespace array
+PYTHONIC_NS_END
+#endif

pythran/pythonic/include/array/array/fromfile.hpp

@@ -0,0 +1,41 @@
+#ifndef PYTHONIC_INCLUDE_ARRAY_ARRAY_FROMFILE_HPP
+#define PYTHONIC_INCLUDE_ARRAY_ARRAY_FROMFILE_HPP
+
+#include "pythonic/include/types/array.hpp"
+#include "pythonic/include/types/file.hpp"
+#include "pythonic/include/utils/functor.hpp"
+
+PYTHONIC_NS_BEGIN
+
+namespace array
+{
+
+  namespace array
+  {
+
+    template <class T>
+    types::none_type fromfile(types::array<T> &seq, types::file &f, long n);
+
+    template <class T>
+    types::none_type fromfile(types::array<T> &seq, types::file &&f, long n)
+    {
+      return fromfile(seq, f, n);
+    }
+
+    template <class T>
+    types::none_type fromfile(types::array<T> &&seq, types::file &&f, long n)
+    {
+      return fromfile(seq, f, n);
+    }
+
+    template <class T>
+    types::none_type fromfile(types::array<T> &&seq, types::file &f, long n)
+    {
+      return fromfile(seq, f, n);
+    }
+
+    DEFINE_FUNCTOR(pythonic::array::array, fromfile);
+  } // namespace array
+} // namespace array
+PYTHONIC_NS_END
+#endif

pythran/pythonic/include/types/file.hpp

@@ -92,6 +92,9 @@ namespace types
 
     types::str read(long size = -1);
 
+    template <class T>
+    void read_as(long n, T *buffer);
+
     types::str readline(long size = std::numeric_limits<long>::max());
 
     types::list<types::str> readlines(long sizehint = -1);

pythran/pythonic/types/file.hpp

@@ -173,6 +173,14 @@ namespace types
     return res;
   }
 
+  template <class T>
+  inline void file::read_as(long n, T *buffer)
+  {
+    if (fread(buffer, sizeof(T), n, **data) < size_t(n)) {
+      throw EOFError("read() didn't return enough bytes");
+    }
+  }
+
   inline types::str file::readline(long size)
   {
     if (!is_open)

pythran/tables.py

@@ -186,6 +186,7 @@ def update_effects(self, node):
         "byteswap": MethodIntr(),
         "count": ConstMethodIntr(),
         "extend": MethodIntr(),
+        "fromfile": MethodIntr(),
     },
     "list": {
         "append": MethodIntr(signature=Fun[[List[T0], T0], None]),

pythran/tests/test_array.py

@@ -1,6 +1,7 @@
 from pythran.tests import TestEnv
 
 import unittest
+from tempfile import mkstemp
 import sys
 
 class TestArray(TestEnv):
@@ -45,3 +46,10 @@ def test_array_count(self):
     def test_array_extend(self):
         self.run_test("def array_extend_(n): import array; x = array.array('h', [n]); x.extend((1, 1)); return x.tolist()",
                       2, array_extend_=[int])
+
+    def test_array_fromfile(self):
+        filename = mkstemp()[1]
+        with open(filename, "w") as fd:
+            fd.write("12345678"*100)
+        self.run_test("def array_fromfile_(s): import array; x = array.array('h'); x.fromfile(open(s, 'rb'), 8); return x.tolist()",
+                      filename, array_fromfile_=[str])