Merge pull request #327 from undingen/str_translate

Implement str.translate() with delete chars

src/runtime/str.cpp

@@ -1695,21 +1695,31 @@ Box* strTitle(BoxedString* self) {
 }
 
 Box* strTranslate(BoxedString* self, BoxedString* table, BoxedString* delete_chars) {
-    RELEASE_ASSERT(self->cls == str_cls, "");
-    RELEASE_ASSERT(table->cls == str_cls, "");
-    RELEASE_ASSERT(delete_chars == NULL || delete_chars->cls == str_cls, "");
-
-    RELEASE_ASSERT(delete_chars == NULL || delete_chars->s.size() == 0, "delete_chars not supported yet");
+    if (self->cls != str_cls)
+        raiseExcHelper(TypeError, "descriptor 'translate' requires a 'str' object but received a '%s'",
+                       getTypeName(self));
 
-    std::ostringstream oss;
+    std::unordered_set<char> delete_set;
+    if (delete_chars) {
+        if (delete_chars->cls != str_cls)
+            raiseExcHelper(TypeError, "expected a character buffer object");
+        delete_set.insert(delete_chars->s.begin(), delete_chars->s.end());
+    }
 
-    if (table->s.size() != 256)
-        raiseExcHelper(ValueError, "translation table must be 256 characters long");
+    bool have_table = table != None;
+    if (have_table) {
+        if (table->cls != str_cls)
+            raiseExcHelper(TypeError, "expected a character buffer object");
+        if (table->s.size() != 256)
+            raiseExcHelper(ValueError, "translation table must be 256 characters long");
+    }
 
-    for (unsigned char c : self->s) {
-        oss << table->s[c];
+    std::string str;
+    for (const char c : self->s) {
+        if (!delete_set.count(c))
+            str.append(1, have_table ? table->s[(unsigned char)c] : c);
     }
-    return boxString(oss.str());
+    return boxString(std::move(str));
 }
 
 Box* strLower(BoxedString* self) {

test/tests/str_functions.py

@@ -70,6 +70,8 @@ for c in "aeiou":
 translation_map = ''.join(translation_map)
 print "hello world".translate(translation_map)
 print "hello world".translate(translation_map, "")
+print "hello world".translate(translation_map, "llo")
+print "hello world".translate(None, "llo")
 
 for i in xrange(-10, 10):
     print i, "aaaaa".find("a", i)