Merge pull request serge-sans-paille#1078 from serge-sans-paille/fix/improve-none-str-support

Getter str/none interaction

Author: serge-sans-paille

pythran/pythonic/include/types/NoneType.hpp

@@ -2,6 +2,7 @@
 #define PYTHONIC_INCLUDE_TYPES_NONE_HPP
 
 #include "pythonic/include/types/assignable.hpp"
+#include <ostream>
 
 PYTHONIC_NS_BEGIN
 
@@ -15,6 +16,11 @@ namespace types
     intptr_t id() const;
   };
 
+  std::ostream &operator<<(std::ostream &os, none_type const &)
+  {
+    return os << "None";
+  }
+
   template <class T, bool is_fundamental = std::is_fundamental<T>::value>
   struct none;
 
@@ -40,6 +46,9 @@ namespace types
     explicit operator bool() const;
 
     intptr_t id() const;
+
+    template <class T0>
+    friend std::ostream &operator<<(std::ostream &os, none<T0, false> const &);
   };
 
   /* specialization of none for integral types we cannot derive from

pythran/pythonic/include/types/str.hpp

@@ -126,12 +126,16 @@ namespace types
     str(std::string const &s);
     str(std::string &&s);
     str(const char *s);
+    template <size_t N>
+    str(const char(&s)[N]);
     str(const char *s, size_t n);
     str(char c);
     template <class S>
     str(sliced_str<S> const &other);
     template <class T>
     str(T const &begin, T const &end);
+    template <class T>
+    explicit str(T const &);
 
     explicit operator char() const;
     explicit operator long int() const;
@@ -191,6 +195,11 @@ namespace types
 
     explicit operator bool() const;
     long count(types::str const &sub) const;
+
+    intptr_t id() const
+    {
+      return reinterpret_cast<intptr_t>(&(*data));
+    }
   };
 
   size_t hash_value(str const &x);
@@ -204,7 +213,10 @@ namespace types
   str operator+(char const(&self)[N], str const &other);
 
   bool operator==(char c, str const &s);
-  bool operator==(str const &s, char c);
+
+  template <size_t N>
+  bool operator==(char const(&self)[N], str const &other);
+
   bool operator!=(char c, str const &s);
   bool operator!=(str const &s, char c);
   std::ostream &operator<<(std::ostream &os, str const &s);

pythran/pythonic/types/NoneType.hpp

@@ -65,6 +65,14 @@ namespace types
   {
     return is_none ? NONE_ID : __builtin__::id(static_cast<const T &>(*this));
   }
+  template <class T>
+  std::ostream &operator<<(std::ostream &os, none<T, false> const &v)
+  {
+    if (v.is_none)
+      return os << none_type();
+    else
+      return os << static_cast<T const &>(v);
+  }
 
   /* specialization of none for integral types we cannot derive from */
   template <class T>
@@ -295,7 +303,7 @@ namespace types
   std::ostream &operator<<(std::ostream &os, none<T, true> const &v)
   {
     if (v.is_none)
-      return os << "None";
+      return os << none_type();
     else
       return os << v.data;
   }

pythran/pythonic/types/str.hpp

@@ -264,6 +264,12 @@ namespace types
   {
   }
 
+  template <size_t N>
+  str::str(const char(&s)[N])
+      : data(s)
+  {
+  }
+
   str::str(const char *s, size_t n) : data(s, n)
   {
   }
@@ -284,6 +290,14 @@ namespace types
   {
   }
 
+  template <class T>
+  str::str(T const &s)
+  {
+    std::ostringstream oss;
+    oss << s;
+    *data = oss.str();
+  }
+
   str::operator char() const
   {
     assert(size() == 1);
@@ -609,6 +623,12 @@ namespace types
     return s.size() == 1 && s[0] == c;
   }
 
+  template <size_t N>
+  bool operator==(char const(&self)[N], str const &other)
+  {
+    return other == self;
+  }
+
   bool operator!=(char c, str const &s)
   {
     return s.size() != 1 || s[0] != c;

pythran/tests/test_none.py

@@ -299,3 +299,16 @@ def test_987_3(x):
                 b = 1
             return (b, a)'''
         self.run_test(code, 3, test_987_3=[int])
+
+    def test_none_to_str(self):
+        code = """
+        def dump_as_str(x):
+            y = x
+            return str(y) + str(y) * 2
+        def none_to_str(x):
+            if x > 1:
+                y = None
+            else:
+                y = 2
+            return dump_as_str(None), dump_as_str(y)"""
+        self.run_test(code, 0, none_to_str=[int])

pythran/tests/test_str.py

@@ -206,3 +206,6 @@ def test_str_numpy_float64(self):
 
     def test_str_int(self):
         self.run_test("def str_int(s): return int(s)", "12", str_int=[str])
+
+    def test_str_id(self):
+        self.run_test("def str_id(x): return id(x) != 0", "hello", str_id=[str])