diff --git a/CHANGELOG.md b/CHANGELOG.md index 20d377cf..f8e3064f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ New features * An integer value can now be indexed to get/set a single bit. * The `bits` method of an integer can be used to iterate through its bits. * New `$bool$`, `$int$`, `$float$` and `$string$` expression types for custom syntax. +* New methods `to_hex`, `to_octal` and `to_binary` for integer numbers. Version 0.20.2 diff --git a/src/packages/string_basic.rs b/src/packages/string_basic.rs index d577fe2e..348e602c 100644 --- a/src/packages/string_basic.rs +++ b/src/packages/string_basic.rs @@ -1,7 +1,8 @@ #![allow(non_snake_case)] use crate::plugin::*; -use crate::{def_package, FnPtr}; +use crate::{def_package, FnPtr, INT}; +use std::fmt::{Binary, LowerHex, Octal}; #[cfg(feature = "no_std")] use std::prelude::v1::*; @@ -16,6 +17,7 @@ pub const FUNC_TO_DEBUG: &'static str = "to_debug"; def_package!(crate:BasicStringPackage:"Basic string utilities, including printing.", lib, { combine_with_exported_module!(lib, "print_debug", print_debug_functions); + combine_with_exported_module!(lib, "number_formatting", number_formatting); }); // Register print and debug @@ -147,3 +149,145 @@ mod print_debug_functions { } } } + +#[export_module] +mod number_formatting { + #[rhai_fn(skip)] + pub fn to_hex(value: T) -> ImmutableString { + format!("{:x}", value).into() + } + #[rhai_fn(skip)] + pub fn to_octal(value: T) -> ImmutableString { + format!("{:o}", value).into() + } + #[rhai_fn(skip)] + pub fn to_binary(value: T) -> ImmutableString { + format!("{:b}", value).into() + } + + #[rhai_fn(name = "to_hex")] + pub fn int_to_hex(value: INT) -> ImmutableString { + to_hex(value) + } + #[rhai_fn(name = "to_octal")] + pub fn int_to_octal(value: INT) -> ImmutableString { + to_octal(value) + } + + #[cfg(not(feature = "only_i32"))] + #[cfg(not(feature = "only_i64"))] + pub mod numbers { + #[rhai_fn(name = "to_hex")] + pub fn u8_to_hex(value: u8) -> ImmutableString { + to_hex(value) + } + #[rhai_fn(name = "to_hex")] + pub fn u16_to_hex(value: u16) -> ImmutableString { + to_hex(value) + } + #[rhai_fn(name = "to_hex")] + pub fn u32_to_hex(value: u32) -> ImmutableString { + to_hex(value) + } + #[rhai_fn(name = "to_hex")] + pub fn u64_to_hex(value: u64) -> ImmutableString { + to_hex(value) + } + #[rhai_fn(name = "to_hex")] + pub fn i8_to_hex(value: i8) -> ImmutableString { + to_hex(value) + } + #[rhai_fn(name = "to_hex")] + pub fn i16_to_hex(value: i16) -> ImmutableString { + to_hex(value) + } + #[rhai_fn(name = "to_hex")] + pub fn i32_to_hex(value: i32) -> ImmutableString { + to_hex(value) + } + #[rhai_fn(name = "to_hex")] + pub fn i64_to_hex(value: i64) -> ImmutableString { + to_hex(value) + } + #[rhai_fn(name = "to_octal")] + pub fn u8_to_octal(value: u8) -> ImmutableString { + to_octal(value) + } + #[rhai_fn(name = "to_octal")] + pub fn u16_to_octal(value: u16) -> ImmutableString { + to_octal(value) + } + #[rhai_fn(name = "to_octal")] + pub fn u32_to_octal(value: u32) -> ImmutableString { + to_octal(value) + } + #[rhai_fn(name = "to_octal")] + pub fn u64_to_octal(value: u64) -> ImmutableString { + to_octal(value) + } + #[rhai_fn(name = "to_octal")] + pub fn i8_to_octal(value: i8) -> ImmutableString { + to_octal(value) + } + #[rhai_fn(name = "to_octal")] + pub fn i16_to_octal(value: i16) -> ImmutableString { + to_octal(value) + } + #[rhai_fn(name = "to_octal")] + pub fn i32_to_octal(value: i32) -> ImmutableString { + to_octal(value) + } + #[rhai_fn(name = "to_octal")] + pub fn i64_to_octal(value: i64) -> ImmutableString { + to_octal(value) + } + #[rhai_fn(name = "to_binary")] + pub fn u8_to_binary(value: u8) -> ImmutableString { + to_binary(value) + } + #[rhai_fn(name = "to_binary")] + pub fn u16_to_binary(value: u16) -> ImmutableString { + to_binary(value) + } + #[rhai_fn(name = "to_binary")] + pub fn u32_to_binary(value: u32) -> ImmutableString { + to_binary(value) + } + #[rhai_fn(name = "to_binary")] + pub fn u64_to_binary(value: u64) -> ImmutableString { + to_binary(value) + } + #[rhai_fn(name = "to_binary")] + pub fn i8_to_binary(value: i8) -> ImmutableString { + to_binary(value) + } + #[rhai_fn(name = "to_binary")] + pub fn i16_to_binary(value: i16) -> ImmutableString { + to_binary(value) + } + #[rhai_fn(name = "to_binary")] + pub fn i32_to_binary(value: i32) -> ImmutableString { + to_binary(value) + } + #[rhai_fn(name = "to_binary")] + pub fn i64_to_binary(value: i64) -> ImmutableString { + to_binary(value) + } + + #[cfg(not(any(target_arch = "wasm32", target_arch = "wasm64")))] + pub mod num_128 { + #[rhai_fn(name = "to_hex")] + pub fn u128_to_hex(value: u128) -> ImmutableString { + to_hex(value) + } + #[rhai_fn(name = "to_octal")] + pub fn i128_to_octal(value: i128) -> ImmutableString { + to_octal(value) + } + #[rhai_fn(name = "to_binary")] + pub fn i128_to_binary(value: i128) -> ImmutableString { + to_binary(value) + } + } + } +}