git.delta.rocks / jrsonnet / refs/commits / e70aa7db346b

1use jrsonnet_evaluator::{error::Result, function::builtin, typed::PositiveF64};1use jrsonnet_evaluator::{error::Result, function::builtin, typed::PositiveF64};
22
3#[builtin]3#[builtin]
4pub fn builtin_abs(x: f64) -> Result<f64> {4pub fn builtin_abs(n: f64) -> Result<f64> {
5	Ok(x.abs())5	Ok(n.abs())
6}6}
77
8#[builtin]8#[builtin]
9pub fn builtin_sign(x: f64) -> Result<f64> {9pub fn builtin_sign(n: f64) -> Result<f64> {
10	Ok(if x == 0. { 0. } else { x.signum() })10	Ok(if n == 0. { 0. } else { n.signum() })
11}11}
1212
13#[builtin]13#[builtin]
14pub fn builtin_max(x: f64, y: f64) -> Result<f64> {14pub fn builtin_max(a: f64, b: f64) -> Result<f64> {
15	Ok(x.max(y))15	Ok(a.max(b))
16}16}
1717
18#[builtin]18#[builtin]
19pub fn builtin_min(x: f64, y: f64) -> Result<f64> {19pub fn builtin_min(a: f64, b: f64) -> Result<f64> {
20	Ok(x.min(y))20	Ok(a.min(b))
21}21}
2222
23#[builtin]23#[builtin]

--- a/crates/jrsonnet-stdlib/src/strings.rs
+++ b/crates/jrsonnet-stdlib/src/strings.rs
@@ -76,38 +76,38 @@
 }
 
 #[builtin]
-pub fn builtin_parse_int(raw: IStr) -> Result<f64> {
-	if let Some(raw) = raw.strip_prefix('-') {
+pub fn builtin_parse_int(str: IStr) -> Result<f64> {
+	if let Some(raw) = str.strip_prefix('-') {
 		if raw.is_empty() {
 			throw!("integer only consists of a minus")
 		}
 
 		parse_nat::<10>(raw).map(|value| -value)
 	} else {
-		if raw.is_empty() {
+		if str.is_empty() {
 			throw!("empty integer")
 		}
 
-		parse_nat::<10>(raw.as_str())
+		parse_nat::<10>(str.as_str())
 	}
 }
 
 #[builtin]
-pub fn builtin_parse_octal(raw: IStr) -> Result<f64> {
-	if raw.is_empty() {
+pub fn builtin_parse_octal(str: IStr) -> Result<f64> {
+	if str.is_empty() {
 		throw!("empty octal integer");
 	}
 
-	parse_nat::<8>(raw.as_str())
+	parse_nat::<8>(str.as_str())
 }
 
 #[builtin]
-pub fn builtin_parse_hex(raw: IStr) -> Result<f64> {
-	if raw.is_empty() {
+pub fn builtin_parse_hex(str: IStr) -> Result<f64> {
+	if str.is_empty() {
 		throw!("empty hexadecimal integer");
 	}
 
-	parse_nat::<16>(raw.as_str())
+	parse_nat::<16>(str.as_str())
 }
 
 fn parse_nat<const BASE: u32>(raw: &str) -> Result<f64> {