use PyInt Ref, add ljust, rjust

Author: jgirardet

tests/snippets/bytes.py

@@ -10,7 +10,7 @@
 with assertRaises(TypeError):
     bytes("bla")
 with assertRaises(TypeError):
-    bytes("bla", encoding = b"jilj")
+    bytes("bla", encoding=b"jilj")
 
 assert (
     b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"
@@ -143,7 +143,7 @@
 except ValueError as e:
     str(e) == "non-hexadecimal number found in fromhex() arg at position 1"
 with assertRaises(TypeError):
-    bytes.fromhex(b'hhjjk')
+    bytes.fromhex(b"hhjjk")
 # center
 assert [b"koki".center(i, b"|") for i in range(3, 10)] == [
     b"koki",
@@ -170,9 +170,70 @@
     b"b".center(2, "a")
 with assertRaises(TypeError):
     b"b".center(2, b"ba")
-b"kok".center(5, bytearray(b"x"))
+assert b"kok".center(5, bytearray(b"x")) == b"xkokx"
 b"kok".center(-5)
 
+
+# ljust
+assert [b"koki".ljust(i, b"|") for i in range(3, 10)] == [
+    b"koki",
+    b"koki",
+    b"koki|",
+    b"koki||",
+    b"koki|||",
+    b"koki||||",
+    b"koki|||||",
+]
+assert [b"kok".ljust(i, b"|") for i in range(2, 10)] == [
+    b"kok",
+    b"kok",
+    b"kok|",
+    b"kok||",
+    b"kok|||",
+    b"kok||||",
+    b"kok|||||",
+    b"kok||||||",
+]
+
+b"kok".ljust(4) == b"kok "  # " test no arg"
+with assertRaises(TypeError):
+    b"b".ljust(2, "a")
+with assertRaises(TypeError):
+    b"b".ljust(2, b"ba")
+assert b"kok".ljust(5, bytearray(b"x")) == b"kokxx"
+assert b"kok".ljust(-5) == b"kok"
+
+# rjust
+assert [b"koki".rjust(i, b"|") for i in range(3, 10)] == [
+    b"koki",
+    b"koki",
+    b"|koki",
+    b"||koki",
+    b"|||koki",
+    b"||||koki",
+    b"|||||koki",
+]
+assert [b"kok".rjust(i, b"|") for i in range(2, 10)] == [
+    b"kok",
+    b"kok",
+    b"|kok",
+    b"||kok",
+    b"|||kok",
+    b"||||kok",
+    b"|||||kok",
+    b"||||||kok",
+]
+
+
+b"kok".rjust(4) == b" kok"  # " test no arg"
+with assertRaises(TypeError):
+    b"b".rjust(2, "a")
+with assertRaises(TypeError):
+    b"b".rjust(2, b"ba")
+assert b"kok".rjust(5, bytearray(b"x")) == b"xxkok"
+assert b"kok".rjust(-5) == b"kok"
+
+
 # count
 assert b"azeazerazeazopia".count(b"aze") == 3
 assert b"azeazerazeazopia".count(b"az") == 4

vm/src/obj/objbyteinner.rs

@@ -1,3 +1,4 @@
+use crate::obj::objint::PyIntRef;
 use crate::obj::objslice::PySlice;
 use crate::pyobject::{PyIterable, PyObjectRef};
 use num_bigint::BigInt;
@@ -376,7 +377,7 @@ impl PyByteInner {
 
     fn get_center_args(
         &self,
-        width_a: PyObjectRef,
+        width: PyIntRef,
         fillbyte: OptionalArg<PyObjectRef>,
         fn_name: String,
         vm: &VirtualMachine,
@@ -404,13 +405,8 @@ impl PyByteInner {
             b' ' // default is space
         };
 
-        let width_b = match_class!(width_a,
-        i @PyInt => i,
-        obj => {return Err(vm.new_type_error(format!("{} cannot be interpreted as an integer", obj)));}
-        );
-
         // <0 = no change
-        let width = if let Some(x) = width_b.as_bigint().to_usize() {
+        let width = if let Some(x) = width.as_bigint().to_usize() {
             if x <= self.len() {
                 0
             } else {
@@ -427,12 +423,12 @@ impl PyByteInner {
 
     pub fn center(
         &self,
-        width_a: PyObjectRef,
+        width: PyIntRef,
         fillbyte: OptionalArg<PyObjectRef>,
         vm: &VirtualMachine,
     ) -> PyResult<Vec<u8>> {
         let fn_name = "center".to_string();
-        let (fillbyte, diff) = self.get_center_args(width_a, fillbyte, fn_name, vm)?;
+        let (fillbyte, diff) = self.get_center_args(width, fillbyte, fn_name, vm)?;
 
         let mut ln: usize = diff / 2;
         let mut rn: usize = ln;
@@ -453,6 +449,39 @@ impl PyByteInner {
         Ok(res)
     }
 
+    pub fn ljust(
+        &self,
+        width: PyIntRef,
+        fillbyte: OptionalArg<PyObjectRef>,
+        vm: &VirtualMachine,
+    ) -> PyResult<Vec<u8>> {
+        let fn_name = "ljust".to_string();
+        let (fillbyte, diff) = self.get_center_args(width, fillbyte, fn_name, vm)?;
+
+        // merge all
+        let mut res = vec![];
+        res.extend_from_slice(&self.elements[..]);
+        res.extend_from_slice(&vec![fillbyte; diff][..]);
+
+        Ok(res)
+    }
+
+    pub fn rjust(
+        &self,
+        width: PyIntRef,
+        fillbyte: OptionalArg<PyObjectRef>,
+        vm: &VirtualMachine,
+    ) -> PyResult<Vec<u8>> {
+        let fn_name = "ljust".to_string();
+        let (fillbyte, diff) = self.get_center_args(width, fillbyte, fn_name, vm)?;
+
+        // merge all
+        let mut res = vec![fillbyte; diff];
+        res.extend_from_slice(&self.elements[..]);
+
+        Ok(res)
+    }
+
     pub fn count(
         &self,
         sub: PyObjectRef,

vm/src/obj/objbytes.rs

@@ -1,3 +1,4 @@
+use crate::obj::objint::PyIntRef;
 use crate::obj::objstr::PyStringRef;
 use crate::vm::VirtualMachine;
 use core::cell::Cell;
@@ -223,13 +224,33 @@ impl PyBytesRef {
     #[pymethod(name = "center")]
     fn center(
         self,
-        width: PyObjectRef,
+        width: PyIntRef,
         fillbyte: OptionalArg<PyObjectRef>,
         vm: &VirtualMachine,
     ) -> PyResult {
         Ok(vm.ctx.new_bytes(self.inner.center(width, fillbyte, vm)?))
     }
 
+    #[pymethod(name = "ljust")]
+    fn ljust(
+        self,
+        width: PyIntRef,
+        fillbyte: OptionalArg<PyObjectRef>,
+        vm: &VirtualMachine,
+    ) -> PyResult {
+        Ok(vm.ctx.new_bytes(self.inner.ljust(width, fillbyte, vm)?))
+    }
+
+    #[pymethod(name = "rjust")]
+    fn rjust(
+        self,
+        width: PyIntRef,
+        fillbyte: OptionalArg<PyObjectRef>,
+        vm: &VirtualMachine,
+    ) -> PyResult {
+        Ok(vm.ctx.new_bytes(self.inner.rjust(width, fillbyte, vm)?))
+    }
+
     #[pymethod(name = "count")]
     fn count(
         self,