Refactor code

RustPython · youknowone · Feb 28, 2023 · Feb 24, 2023 · Feb 24, 2023 · Feb 24, 2023
commit 09c750ce8bee86bf0a162af7d3d1303be8e22b6a
diff --git a/stdlib/src/lib.rs b/stdlib/src/lib.rs
@@ -139,6 +139,7 @@ pub fn get_module_inits() -> impl Iterator<Item = (Cow<'static, str>, StdlibInit
             "_posixsubprocess" => posixsubprocess::make_module,
             "syslog" => syslog::make_module,
             "mmap" => mmap::make_module,
+            "_locale" => locale::make_module,
         }
         #[cfg(all(unix, not(target_os = "redox")))]
         {
@@ -160,9 +161,5 @@ pub fn get_module_inits() -> impl Iterator<Item = (Cow<'static, str>, StdlibInit
         {
             "_uuid" => uuid::make_module,
         }
-        #[cfg(any(target_os = "linux", target_os = "macos"))]
-        {
-            "_locale" => locale::make_module,
-        }
     }
 }
diff --git a/stdlib/src/locale.rs b/stdlib/src/locale.rs
@@ -1,10 +1,9 @@
-#[cfg(any(target_os = "linux", target_os = "macos"))]
+#[cfg(unix)]
 pub(crate) use _locale::make_module;
 
-#[cfg(any(target_os = "linux", target_os = "macos"))]
+#[cfg(unix)]
 #[pymodule]
 mod _locale {
-    extern crate libc;
     use rustpython_vm::{
         builtins::{PyDictRef, PyIntRef, PyListRef},
         PyObjectRef, PyResult, VirtualMachine,
@@ -28,11 +27,11 @@ mod _locale {
         vm.ctx.new_int(libc::c_char::MAX)
     }
 
-    unsafe fn _get_grouping(group: *mut c_char, vm: &VirtualMachine) -> PyListRef {
+    unsafe fn copy_grouping(group: *mut c_char, vm: &VirtualMachine) -> PyListRef {
         let mut group_vec: Vec<PyObjectRef> = Vec::new();
         let mut ptr = group;
 
-        while *ptr != (u8::MIN as i8) && *ptr != i8::MAX {
+        while ![0 as i8, c_char::MAX].contains(&*ptr) {
             let val = vm.ctx.new_int(*ptr);
             group_vec.push(val.into());
             ptr = ptr.offset(1);
@@ -44,54 +43,39 @@ mod _locale {
         let slice = unsafe { CStr::from_ptr(raw_ptr) };
         let cstr = slice
             .to_str()
-            .map(|s| s.to_owned())
-            .map_err(|e| vm.new_unicode_decode_error(format!("unable to decode: {e}")))?;
+            .expect("localeconv always return decodable string");
 
         Ok(vm.new_pyobj(cstr))
     }
 
     #[pyfunction]
     fn localeconv(vm: &VirtualMachine) -> PyResult<PyDictRef> {
         let result = vm.ctx.new_dict();
-        macro_rules! set_string_field {
-            ($field:expr) => {{
-                result.set_item(stringify!($field), _parse_ptr_to_str(vm, $field)?, vm)?
-            }};
-        }
-
-        macro_rules! set_int_field {
-            ($field:expr) => {{
-                result.set_item(stringify!($field), vm.new_pyobj($field), vm)?
-            }};
-        }
-
-        macro_rules! set_group_field {
-            ($field:expr) => {{
-                result.set_item(stringify!($field), _get_grouping($field, vm).into(), vm)?
-            }};
-        }
 
         unsafe {
             let lc = libc::localeconv();
 
-            let mon_grouping = (*lc).mon_grouping;
-            let int_frac_digits = (*lc).int_frac_digits;
-            let frac_digits = (*lc).frac_digits;
-            let p_cs_precedes = (*lc).p_cs_precedes;
-            let p_sep_by_space = (*lc).p_sep_by_space;
-            let n_cs_precedes = (*lc).n_cs_precedes;
-            let p_sign_posn = (*lc).p_sign_posn;
-            let n_sign_posn = (*lc).n_sign_posn;
-            let grouping = (*lc).grouping;
-            let decimal_point = (*lc).decimal_point;
-            let thousands_sep = (*lc).thousands_sep;
-            let int_curr_symbol = (*lc).int_curr_symbol;
-            let currency_symbol = (*lc).currency_symbol;
-            let mon_decimal_point = (*lc).mon_decimal_point;
-            let mon_thousands_sep = (*lc).mon_thousands_sep;
-            let n_sep_by_space = (*lc).n_sep_by_space;
-            let positive_sign = (*lc).positive_sign;
-            let negative_sign = (*lc).negative_sign;
+            macro_rules! set_string_field {
+                ($field:ident) => {{
+                    result.set_item(stringify!($field), _parse_ptr_to_str(vm, (*lc).$field)?, vm)?
+                }};
+            }
+
+            macro_rules! set_int_field {
+                ($field:ident) => {{
+                    result.set_item(stringify!($field), vm.new_pyobj((*lc).$field), vm)?
+         
5FA0
       }};
+            }
+
+            macro_rules! set_group_field {
+                ($field:ident) => {{
+                    result.set_item(
+                        stringify!($field),
+                        copy_grouping((*lc).$field, vm).into(),
+                        vm,
+                    )?
+                }};
+            }
 
             set_group_field!(mon_grouping);
             set_group_field!(grouping);