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

--- a/bindings/jsonnet/src/native.rs
+++ b/bindings/jsonnet/src/native.rs
@@ -1,5 +1,4 @@
 use std::{
-	borrow::Cow,
 	ffi::{c_void, CStr},
 	os::raw::{c_char, c_int},
 };
@@ -82,7 +81,7 @@
 		let param = CStr::from_ptr(*raw_params)
 			.to_str()
 			.expect("param name is not utf-8");
-		params.push(Cow::Owned(param.into()));
+		params.push(param.into());
 		raw_params = raw_params.offset(1);
 	}
 

--- a/crates/jrsonnet-evaluator/src/function/builtin.rs
+++ b/crates/jrsonnet-evaluator/src/function/builtin.rs
@@ -1,18 +1,56 @@
 use std::{any::Any, borrow::Cow};
 
 use jrsonnet_gcmodule::Trace;
+use jrsonnet_interner::IStr;
 
 use super::{arglike::ArgsLike, parse::parse_builtin_call, CallLocation};
 use crate::{error::Result, gc::TraceBox, tb, Context, Val};
 
-pub type BuiltinParamName = Cow<'static, str>;
+/// Can't have str | IStr, because constant BuiltinParam causes
+/// E0492: constant functions cannot refer to interior mutable data
+#[derive(Clone, Trace)]
+pub struct ParamName(Option<Cow<'static, str>>);
+impl ParamName {
+	pub const ANONYMOUS: Self = Self(None);
+	pub const fn new_static(name: &'static str) -> Self {
+		Self(Some(Cow::Borrowed(name)))
+	}
+	pub fn new_dynamic(name: String) -> Self {
+		Self(Some(Cow::Owned(name)))
+	}
+	pub fn as_str(&self) -> Option<&str> {
+		self.0.as_deref()
+	}
+	pub fn is_anonymous(&self) -> bool {
+		self.0.is_none()
+	}
+}
+impl PartialEq<IStr> for ParamName {
+	fn eq(&self, other: &IStr) -> bool {
+		match &self.0 {
+			Some(s) => s.as_bytes() == other.as_bytes(),
+			None => false,
+		}
+	}
+}
 
 #[derive(Clone, Trace)]
 pub struct BuiltinParam {
+	name: ParamName,
+	has_default: bool,
+}
+impl BuiltinParam {
+	pub const fn new(name: ParamName, has_default: bool) -> Self {
+		Self { name, has_default }
+	}
 	/// Parameter name for named call parsing
-	pub name: Option<BuiltinParamName>,
+	pub fn name(&self) -> &ParamName {
+		&self.name
+	}
 	/// Is implementation allowed to return empty value
-	pub has_default: bool,
+	pub fn has_default(&self) -> bool {
+		self.has_default
+	}
 }
 
 /// Description of function defined by native code
@@ -44,12 +82,12 @@
 }
 impl NativeCallback {
 	#[deprecated = "prefer using builtins directly, use this interface only for bindings"]
-	pub fn new(params: Vec<Cow<'static, str>>, handler: impl NativeCallbackHandler) -> Self {
+	pub fn new(params: Vec<String>, handler: impl NativeCallbackHandler) -> Self {
 		Self {
 			params: params
 				.into_iter()
 				.map(|n| BuiltinParam {
-					name: Some(n),
+					name: ParamName::new_dynamic(n.to_string()),
 					has_default: false,
 				})
 				.collect(),

88
9use self::{9use self::{
10	arglike::OptionalContext,10	arglike::OptionalContext,
11	builtin::{Builtin, StaticBuiltin},11	builtin::{Builtin, BuiltinParam, ParamName, StaticBuiltin},
12	native::NativeDesc,12	native::NativeDesc,
13	parse::{parse_default_function_call, parse_function_call},13	parse::{parse_default_function_call, parse_function_call},
14};14};
113	}113	}
114}114}
115
116#[allow(clippy::unnecessary_wraps)]
117#[builtin]
118const fn builtin_id(x: Val) -> Val {
119	x
120}
121static ID: &builtin_id = &builtin_id {};
115122
116impl FuncVal {123impl FuncVal {
117	pub fn builtin(builtin: impl Builtin) -> Self {124	pub fn builtin(builtin: impl Builtin) -> Self {
118		Self::Builtin(Cc::new(tb!(builtin)))125		Self::Builtin(Cc::new(tb!(builtin)))
119	}126	}
127
128	pub fn params(&self) -> Vec<BuiltinParam> {
129		match self {
130			Self::Id => ID.params().to_vec(),
131			Self::StaticBuiltin(i) => i.params().to_vec(),
132			Self::Builtin(i) => i.params().to_vec(),
133			Self::Normal(p) => p
134				.params
135				.iter()
136				.map(|p| {
137					BuiltinParam::new(
138						p.0.name()
139							.as_ref()
140							.map(IStr::to_string)
141							.map_or(ParamName::ANONYMOUS, ParamName::new_dynamic),
142						p.1.is_some(),
143					)
144				})
145				.collect(),
146		}
147	}
120	/// Amount of non-default required arguments148	/// Amount of non-default required arguments
121	pub fn params_len(&self) -> usize {149	pub fn params_len(&self) -> usize {
122		match self {150		match self {
123			Self::Id => 1,151			Self::Id => 1,
124			Self::Normal(n) => n.params.iter().filter(|p| p.1.is_none()).count(),152			Self::Normal(n) => n.params.iter().filter(|p| p.1.is_none()).count(),
125			Self::StaticBuiltin(i) => i.params().iter().filter(|p| !p.has_default).count(),153			Self::StaticBuiltin(i) => i.params().iter().filter(|p| !p.has_default()).count(),
126			Self::Builtin(i) => i.params().iter().filter(|p| !p.has_default).count(),154			Self::Builtin(i) => i.params().iter().filter(|p| !p.has_default()).count(),
127		}155		}
128	}156	}
129	/// Function name, as defined in code.157	/// Function name, as defined in code.
146		tailstrict: bool,174		tailstrict: bool,
147	) -> Result<Val> {175	) -> Result<Val> {
148		match self {176		match self {
149			Self::Id => {177			Self::Id => ID.call(call_ctx, loc, args),
150				#[allow(clippy::unnecessary_wraps)]
151				#[builtin]
152				const fn builtin_id(x: Val) -> Val {
153					x
154				}
155				static ID: &builtin_id = &builtin_id {};
156
157				ID.call(call_ctx, loc, args)
158			}
159			Self::Normal(func) => {178			Self::Normal(func) => {
160				let body_ctx = func.call_body_context(call_ctx, args, tailstrict)?;179				let body_ctx = func.call_body_context(call_ctx, args, tailstrict)?;
161				evaluate(body_ctx, &func.body)180				evaluate(body_ctx, &func.body)

--- a/crates/jrsonnet-evaluator/src/function/parse.rs
+++ b/crates/jrsonnet-evaluator/src/function/parse.rs
@@ -163,7 +163,7 @@
 			params.len(),
 			params
 				.iter()
-				.map(|p| (p.name.as_ref().map(|v| v.as_ref().into()), p.has_default))
+				.map(|p| (p.name().as_str().map(IStr::from), p.has_default()))
 				.collect()
 		))
 	}
@@ -180,7 +180,7 @@
 		// FIXME: O(n) for arg existence check
 		let id = params
 			.iter()
-			.position(|p| p.name.as_ref().map_or(false, |v| v as &str == name as &str))
+			.position(|p| p.name() == name)
 			.ok_or_else(|| UnknownFunctionParameter((name as &str).to_owned()))?;
 		if replace(&mut passed_args[id], Some(arg)).is_some() {
 			throw!(BindingParameterASecondTime(name.clone()));
@@ -190,7 +190,7 @@
 	})?;
 
 	if filled_args < params.len() {
-		for (id, _) in params.iter().enumerate().filter(|(_, p)| p.has_default) {
+		for (id, _) in params.iter().enumerate().filter(|(_, p)| p.has_default()) {
 			if passed_args[id].is_some() {
 				continue;
 			}
@@ -202,20 +202,16 @@
 			for param in params.iter().skip(args.unnamed_len()) {
 				let mut found = false;
 				args.named_names(&mut |name| {
-					if param
-						.name
-						.as_ref()
-						.map_or(false, |v| v as &str == name as &str)
-					{
+					if param.name() == name {
 						found = true;
 					}
 				});
 				if !found {
 					throw!(FunctionParameterNotBoundInCall(
-						param.name.as_ref().map(|v| v.as_ref().into()),
+						param.name().as_str().map(IStr::from),
 						params
 							.iter()
-							.map(|p| (p.name.as_ref().map(|p| p.as_ref().into()), p.has_default))
+							.map(|p| (p.name().as_str().map(IStr::from), p.has_default()))
 							.collect()
 					));
 				}

--- a/tests/tests/common.rs
+++ b/tests/tests/common.rs
@@ -1,5 +1,3 @@
-use std::borrow::Cow;
-
 use jrsonnet_evaluator::{
 	error::Result,
 	function::{builtin, FuncVal},
@@ -66,22 +64,12 @@
 		FuncVal::StaticBuiltin(b) => b
 			.params()
 			.iter()
-			.map(|p| {
-				p.name
-					.as_ref()
-					.unwrap_or(&Cow::Borrowed("<unnamed>"))
-					.to_string()
-			})
+			.map(|p| p.name().as_str().unwrap_or(&"<unnamed>").to_string())
 			.collect(),
 		FuncVal::Builtin(b) => b
 			.params()
 			.iter()
-			.map(|p| {
-				p.name
-					.as_ref()
-					.unwrap_or(&Cow::Borrowed("<unnamed>"))
-					.to_string()
-			})
+			.map(|p| p.name().as_str().unwrap_or(&"<unnamed>").to_string())
 			.collect(),
 	}
 }