Reuse builtin payload and display helpers

src/builtin/abs.rs

@@ -5,9 +5,7 @@ builtin! {
     name: "abs",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      Ok(Value::Number(
-        payload.arguments[0].number(payload.span)?.abs(),
-      ))
+      Ok(Value::Number(payload.number(0)?.abs()))
     }
   }
 }

src/builtin/acos.rs

@@ -5,7 +5,7 @@ builtin! {
     name: "acos",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      let argument = payload.arguments[0].number(payload.span)?;
+      let argument = payload.number(0)?;
 
       if argument < &Number::from(-1_i64) || argument > &Number::from(1_i64) {
         return Err(Error::new(

src/builtin/acot.rs

@@ -5,7 +5,7 @@ builtin! {
     name: "acot",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      let argument = payload.arguments[0].number(payload.span)?;
+      let argument = payload.number(0)?;
 
       let pi_div_2 = Number::Approx(
         Float::with_val_round(

src/builtin/acsc.rs

@@ -5,7 +5,7 @@ builtin! {
     name: "acsc",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      let argument = payload.arguments[0].number(payload.span)?;
+      let argument = payload.number(0)?;
 
       if argument.abs() < Number::from(1_i64) {
         return Err(Error::new(

src/builtin/arc.rs

@@ -5,11 +5,7 @@ builtin! {
     name: "arc",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      Ok(Value::Number(
-        payload.arguments[0]
-          .number(payload.span)?
-          .atan(payload.config),
-      ))
+      Ok(Value::Number(payload.number(0)?.atan(payload.config)))
     }
   }
 }

src/builtin/asec.rs

@@ -5,7 +5,7 @@ builtin! {
     name: "asec",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      let argument = payload.arguments[0].number(payload.span)?;
+      let argument = payload.number(0)?;
 
       if argument.abs() < Number::from(1_i64) {
         return Err(Error::new(

src/builtin/asin.rs

@@ -5,7 +5,7 @@ builtin! {
     name: "asin",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      let argument = payload.arguments[0].number(payload.span)?;
+      let argument = payload.number(0)?;
 
       if argument < &Number::from(-1_i64) || argument > &Number::from(1_i64) {
         return Err(Error::new(

src/builtin/ceil.rs

@@ -5,9 +5,7 @@ builtin! {
     name: "ceil",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      Ok(Value::Number(
-        payload.arguments[0].number(payload.span)?.ceil(),
-      ))
+      Ok(Value::Number(payload.number(0)?.ceil()))
     }
   }
 }

src/builtin/cos.rs

@@ -5,11 +5,7 @@ builtin! {
     name: "cos",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      Ok(Value::Number(
-        payload.arguments[0]
-          .number(payload.span)?
-          .cos(payload.config),
-      ))
+      Ok(Value::Number(payload.number(0)?.cos(payload.config)))
     }
   }
 }

src/builtin/cosh.rs

@@ -5,11 +5,7 @@ builtin! {
     name: "cosh",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      Ok(Value::Number(
-        payload.arguments[0]
-          .number(payload.span)?
-          .cosh(payload.config),
-      ))
+      Ok(Value::Number(payload.number(0)?.cosh(payload.config)))
     }
   }
 }

src/builtin/cot.rs

@@ -5,9 +5,7 @@ builtin! {
     name: "cot",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      let tan = payload.arguments[0]
-        .number(payload.span)?
-        .tan(payload.config);
+      let tan = payload.number(0)?.tan(payload.config);
 
       if tan.is_zero() {
         return Err(Error::new(

src/builtin/csc.rs

@@ -5,9 +5,7 @@ builtin! {
     name: "csc",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      let sin = payload.arguments[0]
-        .number(payload.span)?
-        .sin(payload.config);
+      let sin = payload.number(0)?.sin(payload.config);
 
       if sin.is_zero() {
         return Err(Error::new(

src/builtin/e.rs

@@ -5,11 +5,7 @@ builtin! {
     name: "e",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      Ok(Value::Number(
-        payload.arguments[0]
-          .number(payload.span)?
-          .exp(payload.config),
-      ))
+      Ok(Value::Number(payload.number(0)?.exp(payload.config)))
     }
   }
 }

src/builtin/exit.rs

@@ -11,10 +11,7 @@ builtin! {
       let code = if payload.arguments.is_empty() {
         0
       } else {
-        let Some(code) = payload.arguments[0]
-          .number(payload.span)?
-          .to_non_negative_usize()
-        else {
+        let Some(code) = payload.number(0)?.to_non_negative_usize() else {
           return Err(Error::new(
             payload.span,
             format!("Argument to `{name}` must be a non-negative finite number"),

src/builtin/floor.rs

@@ -5,9 +5,7 @@ builtin! {
     name: "floor",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      Ok(Value::Number(
-        payload.arguments[0].number(payload.span)?.floor(),
-      ))
+      Ok(Value::Number(payload.number(0)?.floor()))
     }
   }
 }

src/builtin/join.rs

@@ -11,10 +11,7 @@ builtin! {
 
       let joined_string = list
         .iter()
-        .map(|value| match value {
-          Value::String(s) => s.clone(),
-          _ => value.display(payload.config),
-        })
+        .map(|value| value.display(payload.config))
         .collect::<Vec<_>>()
         .join(delimiter);
 

src/builtin/sec.rs

@@ -5,9 +5,7 @@ builtin! {
     name: "sec",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      let cos = payload.arguments[0]
-        .number(payload.span)?
-        .cos(payload.config);
+      let cos = payload.number(0)?.cos(payload.config);
 
       if cos.is_zero() {
         return Err(Error::new(payload.span, "Cannot compute sec of π/2 + nπ"));

src/builtin/sin.rs

@@ -5,11 +5,7 @@ builtin! {
     name: "sin",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      Ok(Value::Number(
-        payload.arguments[0]
-          .number(payload.span)?
-          .sin(payload.config),
-      ))
+      Ok(Value::Number(payload.number(0)?.sin(payload.config)))
     }
   }
 }

src/builtin/sinh.rs

@@ -5,11 +5,7 @@ builtin! {
     name: "sinh",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      Ok(Value::Number(
-        payload.arguments[0]
-          .number(payload.span)?
-          .sinh(payload.config),
-      ))
+      Ok(Value::Number(payload.number(0)?.sinh(payload.config)))
     }
   }
 }

src/builtin/sqrt.rs

@@ -5,7 +5,7 @@ builtin! {
     name: "sqrt",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      let number = payload.arguments[0].number(payload.span)?;
+      let number = payload.number(0)?;
 
       if number.is_negative() {
         return Err(Error::new(

src/builtin/tan.rs

@@ -5,11 +5,7 @@ builtin! {
     name: "tan",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      Ok(Value::Number(
-        payload.arguments[0]
-          .number(payload.span)?
-          .tan(payload.config),
-      ))
+      Ok(Value::Number(payload.number(0)?.tan(payload.config)))
     }
   }
 }

src/builtin/tanh.rs

@@ -5,11 +5,7 @@ builtin! {
     name: "tanh",
     arity: BuiltinArity::Exact(1),
     call(payload) {
-      Ok(Value::Number(
-        payload.arguments[0]
-          .number(payload.span)?
-          .tanh(payload.config),
-      ))
+      Ok(Value::Number(payload.number(0)?.tanh(payload.config)))
     }
   }
 }