Rename types::array into types::array_tuple so that types::array can …

…be used normally

types::array_tuple is exactly what's it seems to be: a tuple of homogeneous
data that can be represented as an array.

types::array is the underlying type used to store array.ArrayType, currently
just an alias on types::list

pythran/pythonic/__dispatch__/conjugate.hpp

@@ -15,7 +15,7 @@ namespace __dispatch__
   {
     return numpy::functor::conjugate{}(any);
   }
-}
+} // namespace __dispatch__
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/__dispatch__/copy.hpp

@@ -14,7 +14,7 @@ namespace __dispatch__
   {
     return any.copy();
   }
-}
+} // namespace __dispatch__
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/__dispatch__/count.hpp

@@ -11,12 +11,12 @@ namespace __dispatch__
 {
 
   template <class Any, class Value>
-  auto count(Any &&any, Value &&value)
-      -> decltype(any.count(std::forward<Value>(value)))
+  auto count(Any &&any,
+             Value &&value) -> decltype(any.count(std::forward<Value>(value)))
   {
     return any.count(std::forward<Value>(value));
   }
-}
+} // namespace __dispatch__
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/__dispatch__/pop.hpp

@@ -10,12 +10,12 @@ PYTHONIC_NS_BEGIN
 namespace __dispatch__
 {
   template <class Any, class... Arg0>
-  auto pop(Any &&any, Arg0 &&... arg0)
-      -> decltype(any.pop(std::forward<Arg0>(arg0)...))
+  auto pop(Any &&any,
+           Arg0 &&...arg0) -> decltype(any.pop(std::forward<Arg0>(arg0)...))
   {
     return any.pop(std::forward<Arg0>(arg0)...);
   }
-}
+} // namespace __dispatch__
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/__dispatch__/remove.hpp

@@ -14,7 +14,7 @@ namespace __dispatch__
   {
     return any.remove(arg0);
   }
-}
+} // namespace __dispatch__
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/__dispatch__/sort.hpp

@@ -12,27 +12,27 @@ namespace __dispatch__
 {
 
   template <class T, class... Args>
-  auto sort(types::list<T> &l, Args &&... args)
+  auto sort(types::list<T> &l, Args &&...args)
       -> decltype(pythonic::builtins::list::sort(l,
                                                  std::forward<Args>(args)...))
   {
     return pythonic::builtins::list::sort(l, std::forward<Args>(args)...);
   }
   template <class T, class... Args>
-  auto sort(types::list<T> &&l, Args &&... args)
+  auto sort(types::list<T> &&l, Args &&...args)
       -> decltype(pythonic::builtins::list::sort(std::move(l),
                                                  std::forward<Args>(args)...))
   {
     return pythonic::builtins::list::sort(std::move(l),
                                           std::forward<Args>(args)...);
   }
   template <class Any, class... Args>
-  types::none_type sort(Any &&any, Args &&... args)
+  types::none_type sort(Any &&any, Args &&...args)
   {
     return pythonic::numpy::ndarray::sort(std::forward<Any>(any),
                                           std::forward<Args>(args)...);
   }
-}
+} // namespace __dispatch__
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/__dispatch__/update.hpp

@@ -11,12 +11,12 @@ namespace __dispatch__
 {
 
   template <class Any, class... Arg0>
-  auto update(Any &&any, Arg0 &&... arg0)
+  auto update(Any &&any, Arg0 &&...arg0)
       -> decltype(any.update(std::forward<Arg0>(arg0)...))
   {
     return any.update(std::forward<Arg0>(arg0)...);
   }
-}
+} // namespace __dispatch__
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/array/array.hpp

@@ -12,15 +12,15 @@ namespace array
 {
 
   template <char c>
-  types::list<typename details::typecodes<c>::type>
+  types::array<typename details::typecodes<c>::type>
   array(std::integral_constant<char, c>)
   {
     return {};
   }
 
   template <char c, class E>
-  types::list<typename details::typecodes<c>::type>
-  array(std::integral_constant<char, c>, E&& elts)
+  types::array<typename details::typecodes<c>::type>
+  array(std::integral_constant<char, c>, E &&elts)
   {
     return {std::forward<E>(elts)};
   }

pythran/pythonic/bisect/bisect.hpp

@@ -1,8 +1,8 @@
 #ifndef PYTHONIC_BISECT_BISECT_HPP
 #define PYTHONIC_BISECT_BISECT_HPP
 
-#include "pythonic/include/bisect/bisect.hpp"
 #include "pythonic/builtins/ValueError.hpp"
+#include "pythonic/include/bisect/bisect.hpp"
 
 #include "pythonic/utils/functor.hpp"
 
@@ -29,7 +29,7 @@ namespace bisect
       throw types::ValueError("lo must be non-negative");
     return std::distance(x.begin(), fun(x.begin() + lo, x.begin() + hi, a));
   }
-}
+} // namespace bisect
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/bisect/bisect_left.hpp

@@ -24,7 +24,7 @@ namespace bisect
     return bisect(x, a, lo, hi,
                   std::lower_bound<typename X::const_iterator, A>);
   }
-}
+} // namespace bisect
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/bisect/bisect_right.hpp

@@ -22,7 +22,7 @@ namespace bisect
   {
     return bisect(x, a, lo, hi);
   }
-}
+} // namespace bisect
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/builtins/all.hpp

@@ -1,8 +1,8 @@
 #ifndef PYTHONIC_BUILTIN_ALL_HPP
 #define PYTHONIC_BUILTIN_ALL_HPP
 
-#include "pythonic/utils/functor.hpp"
 #include "pythonic/include/builtins/all.hpp"
+#include "pythonic/utils/functor.hpp"
 
 PYTHONIC_NS_BEGIN
 
@@ -18,7 +18,7 @@ namespace builtins
         return false;
     return true;
   }
-}
+} // namespace builtins
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/builtins/any.hpp

@@ -18,7 +18,7 @@ namespace builtins
         return true;
     return false;
   }
-}
+} // namespace builtins
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/builtins/bin.hpp

@@ -58,7 +58,7 @@ namespace builtins
       return res;
     }
   }
-}
+} // namespace builtins
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/builtins/bool_.hpp

@@ -26,7 +26,7 @@ namespace builtins
     }
 
     template <class T, size_t N>
-    bool bool_::operator()(types::array<T, N> const &val) const
+    bool bool_::operator()(types::array_tuple<T, N> const &val) const
     {
       return N;
     }

pythran/pythonic/builtins/chr.hpp

@@ -15,7 +15,7 @@ namespace builtins
   {
     return types::str((char)v);
   }
-}
+} // namespace builtins
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/builtins/dict.hpp

@@ -28,9 +28,10 @@ namespace builtins
     }
 
     template <class Iterable>
-    auto dict(Iterable &&iterable) -> types::dict<
-        typename std::decay<decltype(std::get<0>(*iterable.begin()))>::type,
-        typename std::decay<decltype(std::get<1>(*iterable.begin()))>::type>
+    auto dict(Iterable &&iterable)
+        -> types::dict<
+            typename std::decay<decltype(std::get<0>(*iterable.begin()))>::type,
+            typename std::decay<decltype(std::get<1>(*iterable.begin()))>::type>
     {
       types::dict<
           typename std::decay<decltype(std::get<0>(*iterable.begin()))>::type,

pythran/pythonic/builtins/dict/clear.hpp

@@ -1,7 +1,7 @@
 #ifndef PYTHONIC_BUILTIN_DICT_CLEAR_HPP
 #define PYTHONIC_BUILTIN_DICT_CLEAR_HPP
 
-#include "pythonic/include/builtins/dict/clear.hpp"
 #include "pythonic/__dispatch__/clear.hpp"
+#include "pythonic/include/builtins/dict/clear.hpp"
 
 #endif

pythran/pythonic/builtins/dict/copy.hpp

@@ -1,7 +1,7 @@
 #ifndef PYTHONIC_BUILTIN_DICT_COPY_HPP
 #define PYTHONIC_BUILTIN_DICT_COPY_HPP
 
-#include "pythonic/include/builtins/dict/copy.hpp"
 #include "pythonic/__dispatch__/copy.hpp"
+#include "pythonic/include/builtins/dict/copy.hpp"
 
 #endif

pythran/pythonic/builtins/dict/fromkeys.hpp

@@ -21,14 +21,14 @@ namespace builtins
     fromkeys(Iterable &&iter, V const &v)
     {
       types::dict<typename std::remove_reference<Iterable>::type::value_type,
-                  V> D =
-          types::empty_dict(); // Allocate default capacity to dict
+                  V>
+          D = types::empty_dict(); // Allocate default capacity to dict
       for (auto const &i : iter)
         D[i] = v;
       return D;
     }
-  }
-}
+  } // namespace dict
+} // namespace builtins
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/builtins/dict/get.hpp

@@ -3,8 +3,8 @@
 
 #include "pythonic/include/builtins/dict/get.hpp"
 
-#include "pythonic/types/dict.hpp"
 #include "pythonic/types/NoneType.hpp"
+#include "pythonic/types/dict.hpp"
 #include "pythonic/utils/functor.hpp"
 
 PYTHONIC_NS_BEGIN
@@ -32,8 +32,8 @@ namespace builtins
     {
       return default_;
     }
-  }
-}
+  } // namespace dict
+} // namespace builtins
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/builtins/dict/items.hpp

@@ -3,9 +3,9 @@
 
 #include "pythonic/include/builtins/dict/items.hpp"
 
-#include "pythonic/include/utils/functor.hpp"
 #include "pythonic/include/types/dict.hpp"
 #include "pythonic/include/types/list.hpp"
+#include "pythonic/include/utils/functor.hpp"
 
 #include <tuple>
 
@@ -22,8 +22,8 @@ namespace builtins
     {
       return std::forward<D>(d).items();
     }
-  }
-}
+  } // namespace dict
+} // namespace builtins
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/builtins/dict/keys.hpp

@@ -23,8 +23,8 @@ namespace builtins
     {
       return std::forward<D>(d).keys();
     }
-  }
-}
+  } // namespace dict
+} // namespace builtins
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/builtins/dict/pop.hpp

@@ -1,7 +1,7 @@
 #ifndef PYTHONIC_BUILTIN_DICT_POP_HPP
 #define PYTHONIC_BUILTIN_DICT_POP_HPP
 
-#include "pythonic/include/builtins/dict/pop.hpp"
 #include "pythonic/__dispatch__/pop.hpp"
+#include "pythonic/include/builtins/dict/pop.hpp"
 
 #endif

pythran/pythonic/builtins/dict/popitem.hpp

@@ -21,8 +21,8 @@ namespace builtins
     {
       return std::forward<D>(d).popitem();
     }
-  }
-}
+  } // namespace dict
+} // namespace builtins
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/builtins/dict/setdefault.hpp

@@ -37,8 +37,8 @@ namespace builtins
     {
       return d.get(k);
     }
-  }
-}
+  } // namespace dict
+} // namespace builtins
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/builtins/dict/update.hpp

@@ -1,7 +1,7 @@
 #ifndef PYTHONIC_BUILTIN_DICT_UPDATE_HPP
 #define PYTHONIC_BUILTIN_DICT_UPDATE_HPP
 
-#include "pythonic/include/builtins/dict/update.hpp"
 #include "pythonic/__dispatch__/update.hpp"
+#include "pythonic/include/builtins/dict/update.hpp"
 
 #endif

pythran/pythonic/builtins/dict/values.hpp

@@ -19,8 +19,8 @@ namespace builtins
     {
       return std::forward<D>(d).values();
     }
-  }
-}
+  } // namespace dict
+} // namespace builtins
 PYTHONIC_NS_END
 
 #endif

pythran/pythonic/builtins/divmod.hpp

@@ -17,7 +17,7 @@ namespace builtins
   {
     return types::make_tuple(t0 / t1, t0 % t1);
   }
-}
+} // namespace builtins
 PYTHONIC_NS_END
 
 #endif