git.delta.rocks / jrsonnet / refs/commits / 795a53dd5dd7

difftreelog

refactor drop ArgsLike abstraction

pltounypYaroslav Bolyukin2026-03-22parent: #cf6d90f.patch.diff
in: master

17 files changed

modifiedbindings/jsonnet/src/lib.rsdiffbeforeafterboth
before · bindings/jsonnet/src/lib.rs
1#![allow(clippy::box_default)]23pub mod interop;45pub mod import;6pub mod native;7pub mod val_extract;8pub mod val_make;9pub mod val_modify;10pub mod vars_tlas;1112use std::{13	alloc::Layout,14	any::Any,15	borrow::Cow,16	cell::RefCell,17	ffi::{CStr, CString, OsStr},18	os::raw::{c_char, c_double, c_int, c_uint},19	path::{Path, PathBuf},20	rc::Rc,21};2223use jrsonnet_evaluator::{24	apply_tla, bail,25	function::TlaArg,26	gc::WithCapacityExt as _,27	manifest::{JsonFormat, ManifestFormat, ToStringFormat},28	rustc_hash::FxHashMap,29	stack::set_stack_depth_limit,30	trace::{CompactFormat, PathResolver, TraceFormat},31	AsPathLike, FileImportResolver, IStr, ImportResolver, Result, State, Val,32};33use jrsonnet_gcmodule::Acyclic;34use jrsonnet_parser::SourcePath;35use jrsonnet_stdlib::ContextInitializer;3637/// WASM stub38#[cfg(target_arch = "wasm32")]39#[no_mangle]40pub extern "C" fn _start() {}4142/// Return the version string of the Jsonnet interpreter.43/// Conforms to [semantic versioning](http://semver.org/).44/// If this does not match `LIB_JSONNET_VERSION`45/// then there is a mismatch between header and compiled library.46#[no_mangle]47pub extern "C" fn jsonnet_version() -> &'static [u8; 8] {48	b"v0.20.0\0"49}5051unsafe fn parse_path(input: &CStr) -> Cow<'_, Path> {52	#[cfg(target_family = "unix")]53	{54		use std::os::unix::ffi::OsStrExt;55		let str = OsStr::from_bytes(input.to_bytes());56		Cow::Borrowed(Path::new(str))57	}58	#[cfg(not(target_family = "unix"))]59	{60		let string = input.to_str().expect("bad utf-8");61		Cow::Borrowed(string.as_ref())62	}63}6465unsafe fn unparse_path(input: &Path) -> CString {66	#[cfg(target_family = "unix")]67	{68		use std::os::unix::ffi::OsStrExt;69		let str = CString::new(input.as_os_str().as_bytes()).expect("input has zero byte in it");70		str71	}72	#[cfg(not(target_family = "unix"))]73	{74		let str = input.as_os_str().to_str().expect("bad utf-8");75		let cstr = CString::new(str).expect("input has NUL inside");76		cstr77	}78}7980#[derive(Acyclic)]81struct VMImportResolver {82	inner: RefCell<Rc<dyn ImportResolver>>,83}84impl VMImportResolver {85	fn new(value: impl ImportResolver) -> Self {86		Self {87			inner: RefCell::new(Rc::new(value)),88		}89	}90}91impl ImportResolver for VMImportResolver {92	fn load_file_contents(&self, resolved: &SourcePath) -> Result<Vec<u8>> {93		self.inner.borrow().load_file_contents(resolved)94	}9596	fn resolve_from(&self, from: &SourcePath, path: &dyn AsPathLike) -> Result<SourcePath> {97		self.inner.borrow().resolve_from(from, path)98	}99100	fn resolve_from_default(&self, path: &dyn AsPathLike) -> Result<SourcePath> {101		self.inner.borrow().resolve_from_default(path)102	}103}104105pub struct VM {106	state: State,107	manifest_format: Box<dyn ManifestFormat>,108	trace_format: Box<dyn TraceFormat>,109	tla_args: FxHashMap<IStr, TlaArg>,110}111impl VM {112	fn replace_import_resolver(&self, resolver: impl ImportResolver) {113		*(self.state.import_resolver() as &dyn Any)114			.downcast_ref::<VMImportResolver>()115			.expect("valid resolver ty")116			.inner117			.borrow_mut() = Rc::new(resolver);118	}119	fn add_jpath(&self, path: PathBuf) {120		let ir = self.state.import_resolver();121		let vmi = (ir as &dyn Any)122			.downcast_ref::<VMImportResolver>()123			.expect("valid resolver ty");124		let vmi = &mut *vmi.inner.borrow_mut();125		(vmi as &mut dyn Any)126			.downcast_mut::<FileImportResolver>()127			.expect("jpaths are not compatible with callback imports!")128			.add_jpath(path);129	}130}131132/// Creates a new Jsonnet virtual machine.133#[no_mangle]134#[allow(clippy::box_default)]135pub extern "C" fn jsonnet_make() -> *mut VM {136	let mut state = State::builder();137	state138		.import_resolver(VMImportResolver::new(FileImportResolver::default()))139		.context_initializer(ContextInitializer::new(PathResolver::new_cwd_fallback()));140	let state = state.build();141	Box::into_raw(Box::new(VM {142		state,143		manifest_format: Box::new(JsonFormat::default()),144		trace_format: Box::new(CompactFormat::default()),145		tla_args: FxHashMap::new(),146	}))147}148149/// Complement of [`jsonnet_vm_make`].150#[no_mangle]151#[allow(clippy::boxed_local)]152pub extern "C" fn jsonnet_destroy(vm: Box<VM>) {153	drop(vm);154}155156/// Set the maximum stack depth.157#[no_mangle]158pub extern "C" fn jsonnet_max_stack(_vm: &VM, v: c_uint) {159	set_stack_depth_limit(v as usize);160}161162/// Set the number of objects required before a garbage collection cycle is allowed.163///164/// No-op for now165#[no_mangle]166pub extern "C" fn jsonnet_gc_min_objects(_vm: &VM, _v: c_uint) {}167168/// Run the garbage collector after this amount of growth in the number of objects169///170/// No-op for now171#[no_mangle]172pub extern "C" fn jsonnet_gc_growth_trigger(_vm: &VM, _v: c_double) {}173174/// Expect a string as output and don't JSON encode it.175#[no_mangle]176pub extern "C" fn jsonnet_string_output(vm: &mut VM, v: c_int) {177	vm.manifest_format = match v {178		0 => Box::new(JsonFormat::default()),179		1 => Box::new(ToStringFormat),180		_ => panic!("incorrect output format"),181	};182}183184/// Allocate, resize, or free a buffer.  This will abort if the memory cannot be allocated. It will185/// only return NULL if sz was zero.186///187/// # Safety188///189/// `buf` should be either previosly allocated by this library, or NULL190///191/// This function is most definitely broken, but it works somehow, see TODO inside192#[no_mangle]193pub unsafe extern "C" fn jsonnet_realloc(_vm: &VM, buf: *mut u8, sz: usize) -> *mut u8 {194	if buf.is_null() {195		if sz == 0 {196			return std::ptr::null_mut();197		}198		return unsafe {199			std::alloc::alloc(Layout::from_size_align(sz, std::mem::align_of::<u8>()).unwrap())200		};201	}202	// TODO: Somehow store size of allocation, because its real size is probally not 16 :D203	// OR (Alternative way of fixing this TODO)204	// TODO: Standard allocator uses malloc, and it doesn't uses allocation size,205	// TODO: so it should work in normal cases. Maybe force allocator for this library?206	let old_layout = Layout::from_size_align(16, std::mem::align_of::<u8>()).unwrap();207	if sz == 0 {208		unsafe { std::alloc::dealloc(buf, old_layout) };209		return std::ptr::null_mut();210	}211	unsafe { std::alloc::realloc(buf, old_layout, sz) }212}213214/// Clean up a JSON subtree.215///216/// This is useful if you want to abort with an error mid-way through building a complex value.217#[no_mangle]218#[allow(clippy::boxed_local)]219pub extern "C" fn jsonnet_json_destroy(_vm: &VM, v: Box<Val>) {220	drop(v);221}222223/// Set the number of lines of stack trace to display (0 for all of them).224#[no_mangle]225pub extern "C" fn jsonnet_max_trace(vm: &mut VM, v: c_uint) {226	if let Some(format) = vm.trace_format.as_any_mut().downcast_mut::<CompactFormat>() {227		format.max_trace = v as usize;228	} else {229		panic!("max_trace is not supported by current tracing format")230	}231}232233/// Evaluate a file containing Jsonnet code, return a JSON string.234///235/// The returned string should be cleaned up with `jsonnet_realloc`.236///237/// # Safety238///239/// `filename` should be a NUL-terminated string240#[no_mangle]241pub unsafe extern "C" fn jsonnet_evaluate_file(242	vm: &VM,243	filename: *const c_char,244	error: &mut c_int,245) -> *const c_char {246	let filename = unsafe { parse_path(CStr::from_ptr(filename)) };247	match vm248		.state249		.import(filename)250		.and_then(|val| apply_tla(&vm.tla_args, val))251		.and_then(|val| val.manifest(&vm.manifest_format))252	{253		Ok(v) => {254			*error = 0;255			CString::new(&*v as &str).unwrap().into_raw()256		}257		Err(e) => {258			*error = 1;259			let mut out = String::new();260			vm.trace_format.write_trace(&mut out, &e).unwrap();261			CString::new(&out as &str).unwrap().into_raw()262		}263	}264}265266/// Evaluate a string containing Jsonnet code, return a JSON string.267///268/// The returned string should be cleaned up with `jsonnet_realloc`.269///270/// # Safety271///272/// `filename`, `snippet` should be a NUL-terminated strings273#[no_mangle]274pub unsafe extern "C" fn jsonnet_evaluate_snippet(275	vm: &VM,276	filename: *const c_char,277	snippet: *const c_char,278	error: &mut c_int,279) -> *const c_char {280	let filename = unsafe { CStr::from_ptr(filename) };281	let snippet = unsafe { CStr::from_ptr(snippet) };282	match vm283		.state284		.evaluate_snippet(filename.to_str().unwrap(), snippet.to_str().unwrap())285		.and_then(|val| apply_tla(&vm.tla_args, val))286		.and_then(|val| val.manifest(&vm.manifest_format))287	{288		Ok(v) => {289			*error = 0;290			CString::new(&*v as &str).unwrap().into_raw()291		}292		Err(e) => {293			*error = 1;294			let mut out = String::new();295			vm.trace_format.write_trace(&mut out, &e).unwrap();296			CString::new(&out as &str).unwrap().into_raw()297		}298	}299}300301fn val_to_multi(val: Val, format: &dyn ManifestFormat) -> Result<Vec<(IStr, IStr)>> {302	let Val::Obj(val) = val else {303		bail!("expected object as multi output")304	};305	let mut out = Vec::new();306	for (k, v) in val.iter(307		#[cfg(feature = "exp-preserve-order")]308		false,309	) {310		out.push((k, v?.manifest(format)?.into()));311	}312	Ok(out)313}314315fn multi_to_raw(multi: Vec<(IStr, IStr)>) -> *const c_char {316	let mut out = Vec::new();317	for (i, (k, v)) in multi.iter().enumerate() {318		if i != 0 {319			out.push(0);320		}321		out.extend_from_slice(k.as_bytes());322		out.push(0);323		out.extend_from_slice(v.as_bytes());324	}325	out.push(0);326	out.push(0);327	let v = out.as_ptr();328	std::mem::forget(out);329	v.cast::<c_char>()330}331332/// # Safety333#[no_mangle]334pub unsafe extern "C" fn jsonnet_evaluate_file_multi(335	vm: &VM,336	filename: *const c_char,337	error: &mut c_int,338) -> *const c_char {339	let filename = unsafe { parse_path(CStr::from_ptr(filename)) };340	match vm341		.state342		.import(filename)343		.and_then(|val| apply_tla(&vm.tla_args, val))344		.and_then(|val| val_to_multi(val, &vm.manifest_format))345	{346		Ok(v) => {347			*error = 0;348			multi_to_raw(v)349		}350		Err(e) => {351			*error = 1;352			let mut out = String::new();353			vm.trace_format.write_trace(&mut out, &e).unwrap();354			CString::new(&out as &str).unwrap().into_raw()355		}356	}357}358359/// # Safety360#[no_mangle]361pub unsafe extern "C" fn jsonnet_evaluate_snippet_multi(362	vm: &VM,363	filename: *const c_char,364	snippet: *const c_char,365	error: &mut c_int,366) -> *const c_char {367	let filename = unsafe { CStr::from_ptr(filename) };368	let snippet = unsafe { CStr::from_ptr(snippet) };369	match vm370		.state371		.evaluate_snippet(filename.to_str().unwrap(), snippet.to_str().unwrap())372		.and_then(|val| apply_tla(&vm.tla_args, val))373		.and_then(|val| val_to_multi(val, &vm.manifest_format))374	{375		Ok(v) => {376			*error = 0;377			multi_to_raw(v)378		}379		Err(e) => {380			*error = 1;381			let mut out = String::new();382			vm.trace_format.write_trace(&mut out, &e).unwrap();383			CString::new(&out as &str).unwrap().into_raw()384		}385	}386}387388fn val_to_stream(val: Val, format: &dyn ManifestFormat) -> Result<Vec<IStr>> {389	let Val::Arr(val) = val else {390		bail!("expected array as stream output")391	};392	let mut out = Vec::new();393	for item in val.iter() {394		out.push(item?.manifest(format)?.into());395	}396	Ok(out)397}398399fn stream_to_raw(multi: Vec<IStr>) -> *const c_char {400	let mut out = Vec::new();401	for (i, v) in multi.iter().enumerate() {402		if i != 0 {403			out.push(0);404		}405		out.extend_from_slice(v.as_bytes());406	}407	out.push(0);408	out.push(0);409	let v = out.as_ptr();410	std::mem::forget(out);411	v.cast::<c_char>()412}413414/// # Safety415#[no_mangle]416pub unsafe extern "C" fn jsonnet_evaluate_file_stream(417	vm: &VM,418	filename: *const c_char,419	error: &mut c_int,420) -> *const c_char {421	let filename = unsafe { parse_path(CStr::from_ptr(filename)) };422	match vm423		.state424		.import(filename)425		.and_then(|val| apply_tla(&vm.tla_args, val))426		.and_then(|val| val_to_stream(val, &vm.manifest_format))427	{428		Ok(v) => {429			*error = 0;430			stream_to_raw(v)431		}432		Err(e) => {433			*error = 1;434			let mut out = String::new();435			vm.trace_format.write_trace(&mut out, &e).unwrap();436			CString::new(&out as &str).unwrap().into_raw()437		}438	}439}440441/// # Safety442#[no_mangle]443pub unsafe extern "C" fn jsonnet_evaluate_snippet_stream(444	vm: &VM,445	filename: *const c_char,446	snippet: *const c_char,447	error: &mut c_int,448) -> *const c_char {449	let filename = unsafe { CStr::from_ptr(filename) };450	let snippet = unsafe { CStr::from_ptr(snippet) };451	match vm452		.state453		.evaluate_snippet(filename.to_str().unwrap(), snippet.to_str().unwrap())454		.and_then(|val| apply_tla(&vm.tla_args, val))455		.and_then(|val| val_to_stream(val, &vm.manifest_format))456	{457		Ok(v) => {458			*error = 0;459			stream_to_raw(v)460		}461		Err(e) => {462			*error = 1;463			let mut out = String::new();464			vm.trace_format.write_trace(&mut out, &e).unwrap();465			CString::new(&out as &str).unwrap().into_raw()466		}467	}468}
after · bindings/jsonnet/src/lib.rs
1#![allow(clippy::box_default)]23pub mod interop;45pub mod import;6pub mod native;7pub mod val_extract;8pub mod val_make;9pub mod val_modify;10pub mod vars_tlas;1112use std::{13	alloc::Layout,14	any::Any,15	borrow::Cow,16	cell::RefCell,17	ffi::{CStr, CString, OsStr},18	os::raw::{c_char, c_double, c_int, c_uint},19	path::{Path, PathBuf},20	rc::Rc,21};2223use jrsonnet_evaluator::{24	apply_tla, bail,25	gc::WithCapacityExt as _,26	manifest::{JsonFormat, ManifestFormat, ToStringFormat},27	rustc_hash::FxHashMap,28	stack::set_stack_depth_limit,29	tla::TlaArg,30	trace::{CompactFormat, PathResolver, TraceFormat},31	AsPathLike, FileImportResolver, IStr, ImportResolver, Result, State, Val,32};33use jrsonnet_gcmodule::Acyclic;34use jrsonnet_parser::SourcePath;35use jrsonnet_stdlib::ContextInitializer;3637/// WASM stub38#[cfg(target_arch = "wasm32")]39#[no_mangle]40pub extern "C" fn _start() {}4142/// Return the version string of the Jsonnet interpreter.43///44/// Conforms to [semantic versioning](http://semver.org/).45/// If this does not match `LIB_JSONNET_VERSION`46/// then there is a mismatch between header and compiled library.47#[no_mangle]48pub extern "C" fn jsonnet_version() -> &'static [u8; 8] {49	b"v0.20.0\0"50}5152unsafe fn parse_path(input: &CStr) -> Cow<'_, Path> {53	#[cfg(target_family = "unix")]54	{55		use std::os::unix::ffi::OsStrExt;56		let str = OsStr::from_bytes(input.to_bytes());57		Cow::Borrowed(Path::new(str))58	}59	#[cfg(not(target_family = "unix"))]60	{61		let string = input.to_str().expect("bad utf-8");62		Cow::Borrowed(string.as_ref())63	}64}6566unsafe fn unparse_path(input: &Path) -> CString {67	#[cfg(target_family = "unix")]68	{69		use std::os::unix::ffi::OsStrExt;70		let str = CString::new(input.as_os_str().as_bytes()).expect("input has zero byte in it");71		str72	}73	#[cfg(not(target_family = "unix"))]74	{75		let str = input.as_os_str().to_str().expect("bad utf-8");76		let cstr = CString::new(str).expect("input has NUL inside");77		cstr78	}79}8081#[derive(Acyclic)]82struct VMImportResolver {83	inner: RefCell<Rc<dyn ImportResolver>>,84}85impl VMImportResolver {86	fn new(value: impl ImportResolver) -> Self {87		Self {88			inner: RefCell::new(Rc::new(value)),89		}90	}91}92impl ImportResolver for VMImportResolver {93	fn load_file_contents(&self, resolved: &SourcePath) -> Result<Vec<u8>> {94		self.inner.borrow().load_file_contents(resolved)95	}9697	fn resolve_from(&self, from: &SourcePath, path: &dyn AsPathLike) -> Result<SourcePath> {98		self.inner.borrow().resolve_from(from, path)99	}100101	fn resolve_from_default(&self, path: &dyn AsPathLike) -> Result<SourcePath> {102		self.inner.borrow().resolve_from_default(path)103	}104}105106pub struct VM {107	state: State,108	manifest_format: Box<dyn ManifestFormat>,109	trace_format: Box<dyn TraceFormat>,110	tla_args: FxHashMap<IStr, TlaArg>,111}112impl VM {113	fn replace_import_resolver(&self, resolver: impl ImportResolver) {114		*(self.state.import_resolver() as &dyn Any)115			.downcast_ref::<VMImportResolver>()116			.expect("valid resolver ty")117			.inner118			.borrow_mut() = Rc::new(resolver);119	}120	fn add_jpath(&self, path: PathBuf) {121		let ir = self.state.import_resolver();122		let vmi = (ir as &dyn Any)123			.downcast_ref::<VMImportResolver>()124			.expect("valid resolver ty");125		let vmi = &mut *vmi.inner.borrow_mut();126		(vmi as &mut dyn Any)127			.downcast_mut::<FileImportResolver>()128			.expect("jpaths are not compatible with callback imports!")129			.add_jpath(path);130	}131}132133/// Creates a new Jsonnet virtual machine.134#[no_mangle]135#[allow(clippy::box_default)]136pub extern "C" fn jsonnet_make() -> *mut VM {137	let mut state = State::builder();138	state139		.import_resolver(VMImportResolver::new(FileImportResolver::default()))140		.context_initializer(ContextInitializer::new(PathResolver::new_cwd_fallback()));141	let state = state.build();142	Box::into_raw(Box::new(VM {143		state,144		manifest_format: Box::new(JsonFormat::default()),145		trace_format: Box::new(CompactFormat::default()),146		tla_args: FxHashMap::new(),147	}))148}149150/// Complement of [`jsonnet_vm_make`].151#[no_mangle]152#[allow(clippy::boxed_local)]153pub extern "C" fn jsonnet_destroy(vm: Box<VM>) {154	drop(vm);155}156157/// Set the maximum stack depth.158#[no_mangle]159pub extern "C" fn jsonnet_max_stack(_vm: &VM, v: c_uint) {160	set_stack_depth_limit(v as usize);161}162163/// Set the number of objects required before a garbage collection cycle is allowed.164///165/// No-op for now166#[no_mangle]167pub extern "C" fn jsonnet_gc_min_objects(_vm: &VM, _v: c_uint) {}168169/// Run the garbage collector after this amount of growth in the number of objects170///171/// No-op for now172#[no_mangle]173pub extern "C" fn jsonnet_gc_growth_trigger(_vm: &VM, _v: c_double) {}174175/// Expect a string as output and don't JSON encode it.176#[no_mangle]177pub extern "C" fn jsonnet_string_output(vm: &mut VM, v: c_int) {178	vm.manifest_format = match v {179		0 => Box::new(JsonFormat::default()),180		1 => Box::new(ToStringFormat),181		_ => panic!("incorrect output format"),182	};183}184185/// Allocate, resize, or free a buffer.  This will abort if the memory cannot be allocated. It will186/// only return NULL if sz was zero.187///188/// # Safety189///190/// `buf` should be either previosly allocated by this library, or NULL191///192/// This function is most definitely broken, but it works somehow, see TODO inside193#[no_mangle]194pub unsafe extern "C" fn jsonnet_realloc(_vm: &VM, buf: *mut u8, sz: usize) -> *mut u8 {195	if buf.is_null() {196		if sz == 0 {197			return std::ptr::null_mut();198		}199		return unsafe {200			std::alloc::alloc(Layout::from_size_align(sz, std::mem::align_of::<u8>()).unwrap())201		};202	}203	// TODO: Somehow store size of allocation, because its real size is probally not 16 :D204	// OR (Alternative way of fixing this TODO)205	// TODO: Standard allocator uses malloc, and it doesn't uses allocation size,206	// TODO: so it should work in normal cases. Maybe force allocator for this library?207	let old_layout = Layout::from_size_align(16, std::mem::align_of::<u8>()).unwrap();208	if sz == 0 {209		unsafe { std::alloc::dealloc(buf, old_layout) };210		return std::ptr::null_mut();211	}212	unsafe { std::alloc::realloc(buf, old_layout, sz) }213}214215/// Clean up a JSON subtree.216///217/// This is useful if you want to abort with an error mid-way through building a complex value.218#[no_mangle]219#[allow(clippy::boxed_local)]220pub extern "C" fn jsonnet_json_destroy(_vm: &VM, v: Box<Val>) {221	drop(v);222}223224/// Set the number of lines of stack trace to display (0 for all of them).225#[no_mangle]226pub extern "C" fn jsonnet_max_trace(vm: &mut VM, v: c_uint) {227	if let Some(format) = vm.trace_format.as_any_mut().downcast_mut::<CompactFormat>() {228		format.max_trace = v as usize;229	} else {230		panic!("max_trace is not supported by current tracing format")231	}232}233234/// Evaluate a file containing Jsonnet code, return a JSON string.235///236/// The returned string should be cleaned up with `jsonnet_realloc`.237///238/// # Safety239///240/// `filename` should be a NUL-terminated string241#[no_mangle]242pub unsafe extern "C" fn jsonnet_evaluate_file(243	vm: &VM,244	filename: *const c_char,245	error: &mut c_int,246) -> *const c_char {247	let filename = unsafe { parse_path(CStr::from_ptr(filename)) };248	match vm249		.state250		.import(filename)251		.and_then(|val| apply_tla(&vm.tla_args, val))252		.and_then(|val| val.manifest(&vm.manifest_format))253	{254		Ok(v) => {255			*error = 0;256			CString::new(&*v as &str).unwrap().into_raw()257		}258		Err(e) => {259			*error = 1;260			let mut out = String::new();261			vm.trace_format.write_trace(&mut out, &e).unwrap();262			CString::new(&out as &str).unwrap().into_raw()263		}264	}265}266267/// Evaluate a string containing Jsonnet code, return a JSON string.268///269/// The returned string should be cleaned up with `jsonnet_realloc`.270///271/// # Safety272///273/// `filename`, `snippet` should be a NUL-terminated strings274#[no_mangle]275pub unsafe extern "C" fn jsonnet_evaluate_snippet(276	vm: &VM,277	filename: *const c_char,278	snippet: *const c_char,279	error: &mut c_int,280) -> *const c_char {281	let filename = unsafe { CStr::from_ptr(filename) };282	let snippet = unsafe { CStr::from_ptr(snippet) };283	match vm284		.state285		.evaluate_snippet(filename.to_str().unwrap(), snippet.to_str().unwrap())286		.and_then(|val| apply_tla(&vm.tla_args, val))287		.and_then(|val| val.manifest(&vm.manifest_format))288	{289		Ok(v) => {290			*error = 0;291			CString::new(&*v as &str).unwrap().into_raw()292		}293		Err(e) => {294			*error = 1;295			let mut out = String::new();296			vm.trace_format.write_trace(&mut out, &e).unwrap();297			CString::new(&out as &str).unwrap().into_raw()298		}299	}300}301302fn val_to_multi(val: Val, format: &dyn ManifestFormat) -> Result<Vec<(IStr, IStr)>> {303	let Val::Obj(val) = val else {304		bail!("expected object as multi output")305	};306	let mut out = Vec::new();307	for (k, v) in val.iter(308		#[cfg(feature = "exp-preserve-order")]309		false,310	) {311		out.push((k, v?.manifest(format)?.into()));312	}313	Ok(out)314}315316fn multi_to_raw(multi: Vec<(IStr, IStr)>) -> *const c_char {317	let mut out = Vec::new();318	for (i, (k, v)) in multi.iter().enumerate() {319		if i != 0 {320			out.push(0);321		}322		out.extend_from_slice(k.as_bytes());323		out.push(0);324		out.extend_from_slice(v.as_bytes());325	}326	out.push(0);327	out.push(0);328	let v = out.as_ptr();329	std::mem::forget(out);330	v.cast::<c_char>()331}332333/// # Safety334#[no_mangle]335pub unsafe extern "C" fn jsonnet_evaluate_file_multi(336	vm: &VM,337	filename: *const c_char,338	error: &mut c_int,339) -> *const c_char {340	let filename = unsafe { parse_path(CStr::from_ptr(filename)) };341	match vm342		.state343		.import(filename)344		.and_then(|val| apply_tla(&vm.tla_args, val))345		.and_then(|val| val_to_multi(val, &vm.manifest_format))346	{347		Ok(v) => {348			*error = 0;349			multi_to_raw(v)350		}351		Err(e) => {352			*error = 1;353			let mut out = String::new();354			vm.trace_format.write_trace(&mut out, &e).unwrap();355			CString::new(&out as &str).unwrap().into_raw()356		}357	}358}359360/// # Safety361#[no_mangle]362pub unsafe extern "C" fn jsonnet_evaluate_snippet_multi(363	vm: &VM,364	filename: *const c_char,365	snippet: *const c_char,366	error: &mut c_int,367) -> *const c_char {368	let filename = unsafe { CStr::from_ptr(filename) };369	let snippet = unsafe { CStr::from_ptr(snippet) };370	match vm371		.state372		.evaluate_snippet(filename.to_str().unwrap(), snippet.to_str().unwrap())373		.and_then(|val| apply_tla(&vm.tla_args, val))374		.and_then(|val| val_to_multi(val, &vm.manifest_format))375	{376		Ok(v) => {377			*error = 0;378			multi_to_raw(v)379		}380		Err(e) => {381			*error = 1;382			let mut out = String::new();383			vm.trace_format.write_trace(&mut out, &e).unwrap();384			CString::new(&out as &str).unwrap().into_raw()385		}386	}387}388389fn val_to_stream(val: Val, format: &dyn ManifestFormat) -> Result<Vec<IStr>> {390	let Val::Arr(val) = val else {391		bail!("expected array as stream output")392	};393	let mut out = Vec::new();394	for item in val.iter() {395		out.push(item?.manifest(format)?.into());396	}397	Ok(out)398}399400fn stream_to_raw(multi: Vec<IStr>) -> *const c_char {401	let mut out = Vec::new();402	for (i, v) in multi.iter().enumerate() {403		if i != 0 {404			out.push(0);405		}406		out.extend_from_slice(v.as_bytes());407	}408	out.push(0);409	out.push(0);410	let v = out.as_ptr();411	std::mem::forget(out);412	v.cast::<c_char>()413}414415/// # Safety416#[no_mangle]417pub unsafe extern "C" fn jsonnet_evaluate_file_stream(418	vm: &VM,419	filename: *const c_char,420	error: &mut c_int,421) -> *const c_char {422	let filename = unsafe { parse_path(CStr::from_ptr(filename)) };423	match vm424		.state425		.import(filename)426		.and_then(|val| apply_tla(&vm.tla_args, val))427		.and_then(|val| val_to_stream(val, &vm.manifest_format))428	{429		Ok(v) => {430			*error = 0;431			stream_to_raw(v)432		}433		Err(e) => {434			*error = 1;435			let mut out = String::new();436			vm.trace_format.write_trace(&mut out, &e).unwrap();437			CString::new(&out as &str).unwrap().into_raw()438		}439	}440}441442/// # Safety443#[no_mangle]444pub unsafe extern "C" fn jsonnet_evaluate_snippet_stream(445	vm: &VM,446	filename: *const c_char,447	snippet: *const c_char,448	error: &mut c_int,449) -> *const c_char {450	let filename = unsafe { CStr::from_ptr(filename) };451	let snippet = unsafe { CStr::from_ptr(snippet) };452	match vm453		.state454		.evaluate_snippet(filename.to_str().unwrap(), snippet.to_str().unwrap())455		.and_then(|val| apply_tla(&vm.tla_args, val))456		.and_then(|val| val_to_stream(val, &vm.manifest_format))457	{458		Ok(v) => {459			*error = 0;460			stream_to_raw(v)461		}462		Err(e) => {463			*error = 1;464			let mut out = String::new();465			vm.trace_format.write_trace(&mut out, &e).unwrap();466			CString::new(&out as &str).unwrap().into_raw()467		}468	}469}
modifiedbindings/jsonnet/src/vars_tlas.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/vars_tlas.rs
+++ b/bindings/jsonnet/src/vars_tlas.rs
@@ -2,7 +2,8 @@
 
 use std::{ffi::CStr, os::raw::c_char};
 
-use jrsonnet_evaluator::{function::TlaArg, IStr};
+use jrsonnet_evaluator::tla::TlaArg;
+use jrsonnet_evaluator::IStr;
 
 use crate::VM;
 
modifiedcrates/jrsonnet-cli/src/stdlib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/stdlib.rs
+++ b/crates/jrsonnet-cli/src/stdlib.rs
@@ -1,7 +1,8 @@
 use std::str::FromStr;
 
 use clap::Parser;
-use jrsonnet_evaluator::{function::TlaArg, trace::PathResolver, Result};
+use jrsonnet_evaluator::tla::TlaArg;
+use jrsonnet_evaluator::{trace::PathResolver, Result};
 use jrsonnet_stdlib::ContextInitializer;
 
 #[derive(Clone)]
modifiedcrates/jrsonnet-cli/src/tla.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/tla.rs
+++ b/crates/jrsonnet-cli/src/tla.rs
@@ -1,7 +1,6 @@
 use clap::Parser;
-use jrsonnet_evaluator::{
-	error::Result, function::TlaArg, gc::WithCapacityExt as _, rustc_hash::FxHashMap, IStr,
-};
+use jrsonnet_evaluator::tla::TlaArg;
+use jrsonnet_evaluator::{error::Result, gc::WithCapacityExt as _, rustc_hash::FxHashMap, IStr};
 
 use crate::{ExtFile, ExtStr};
 
modifiedcrates/jrsonnet-evaluator/src/arr/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/arr/mod.rs
+++ b/crates/jrsonnet-evaluator/src/arr/mod.rs
@@ -9,7 +9,7 @@
 use jrsonnet_interner::IBytes;
 use jrsonnet_parser::{Expr, Spanned};
 
-use crate::{typed::NativeFn, Context, Result, Thunk, Val};
+use crate::{function::NativeFn, Context, Result, Thunk, Val};
 
 mod spec;
 pub use spec::{ArrayLike, *};
modifiedcrates/jrsonnet-evaluator/src/arr/spec.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/arr/spec.rs
+++ b/crates/jrsonnet-evaluator/src/arr/spec.rs
@@ -6,8 +6,7 @@
 use jrsonnet_parser::{Expr, Spanned};
 
 use super::ArrValue;
-use crate::typed::NativeFn;
-use crate::val::NumValue;
+use crate::function::NativeFn;
 use crate::{
 	error::ErrorKind::InfiniteRecursionDetected, evaluate, typed::Typed, val::ThunkValue, Context,
 	Error, ObjValue, Result, Thunk, Val,
deletedcrates/jrsonnet-evaluator/src/function/arglike.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/arglike.rs
+++ /dev/null
@@ -1,197 +0,0 @@
-use std::collections::HashMap;
-use std::rc::Rc;
-
-use jrsonnet_gcmodule::Trace;
-use jrsonnet_interner::IStr;
-use jrsonnet_parser::{ArgsDesc, Expr, SourceFifo, SourcePath, Spanned};
-
-use crate::{evaluate, typed::Typed, with_state, Context, Result, Thunk, Val};
-
-pub trait ArgLike {
-	fn evaluate_arg(&self, ctx: Context, tailstrict: bool) -> Result<Thunk<Val>>;
-}
-
-impl ArgLike for &Rc<Spanned<Expr>> {
-	fn evaluate_arg(&self, ctx: Context, tailstrict: bool) -> Result<Thunk<Val>> {
-		Ok(if tailstrict {
-			Thunk::evaluated(evaluate(ctx, self)?)
-		} else {
-			let expr = (*self).clone();
-			Thunk!(move || evaluate(ctx, &expr))
-		})
-	}
-}
-
-impl<T> ArgLike for T
-where
-	T: Typed + Clone,
-{
-	fn evaluate_arg(&self, _ctx: Context, tailstrict: bool) -> Result<Thunk<Val>> {
-		if T::provides_lazy() && !tailstrict {
-			return Ok(T::into_lazy_untyped(self.clone()));
-		}
-		let val = T::into_untyped(self.clone())?;
-		Ok(Thunk::evaluated(val))
-	}
-}
-
-#[derive(Clone, Trace)]
-pub enum TlaArg {
-	String(IStr),
-	Val(Val),
-	Lazy(Thunk<Val>),
-	Import(String),
-	ImportStr(String),
-	InlineCode(String),
-}
-impl TlaArg {
-	pub fn evaluate_tailstrict(&self) -> Result<Val> {
-		match self {
-			Self::String(s) => Ok(Val::string(s.clone())),
-			Self::Val(val) => Ok(val.clone()),
-			Self::Lazy(lazy) => Ok(lazy.evaluate()?),
-			Self::Import(p) => with_state(|s| {
-				let resolved = s.resolve_from_default(&p.as_str())?;
-				s.import_resolved(resolved)
-			}),
-			Self::ImportStr(p) => with_state(|s| {
-				let resolved = s.resolve_from_default(&p.as_str())?;
-				s.import_resolved_str(resolved).map(Val::string)
-			}),
-			Self::InlineCode(p) => with_state(|s| {
-				let resolved =
-					SourcePath::new(SourceFifo("<inline code>".to_owned(), p.as_bytes().into()));
-				s.import_resolved(resolved)
-			}),
-		}
-	}
-	pub fn evaluate(&self) -> Result<Thunk<Val>> {
-		match self {
-			Self::String(s) => Ok(Thunk::evaluated(Val::string(s.clone()))),
-			Self::Val(val) => Ok(Thunk::evaluated(val.clone())),
-			Self::Lazy(lazy) => Ok(lazy.clone()),
-			Self::Import(p) => with_state(|s| {
-				let resolved = s.resolve_from_default(&p.as_str())?;
-				Ok(Thunk!(move || s.import_resolved(resolved)))
-			}),
-			Self::ImportStr(p) => with_state(|s| {
-				let resolved = s.resolve_from_default(&p.as_str())?;
-				Ok(Thunk!(move || s
-					.import_resolved_str(resolved)
-					.map(Val::string)))
-			}),
-			Self::InlineCode(p) => with_state(|s| {
-				let resolved =
-					SourcePath::new(SourceFifo("<inline code>".to_owned(), p.as_bytes().into()));
-				Ok(Thunk!(move || s.import_resolved(resolved)))
-			}),
-		}
-	}
-}
-
-pub trait ArgsLike {
-	fn unnamed_len(&self) -> usize;
-	fn unnamed_iter(
-		&self,
-		ctx: Context,
-		tailstrict: bool,
-		handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,
-	) -> Result<()>;
-	fn named_iter(
-		&self,
-		ctx: Context,
-		tailstrict: bool,
-		handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,
-	) -> Result<()>;
-	fn named_names(&self, handler: &mut dyn FnMut(&IStr));
-	fn is_empty(&self) -> bool;
-}
-
-impl ArgsLike for Vec<Val> {
-	fn unnamed_len(&self) -> usize {
-		self.len()
-	}
-	fn unnamed_iter(
-		&self,
-		_ctx: Context,
-		_tailstrict: bool,
-		handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,
-	) -> Result<()> {
-		for (idx, el) in self.iter().enumerate() {
-			handler(idx, Thunk::evaluated(el.clone()))?;
-		}
-		Ok(())
-	}
-	fn named_iter(
-		&self,
-		_ctx: Context,
-		_tailstrict: bool,
-		_handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,
-	) -> Result<()> {
-		Ok(())
-	}
-	fn named_names(&self, _handler: &mut dyn FnMut(&IStr)) {}
-	fn is_empty(&self) -> bool {
-		self.is_empty()
-	}
-}
-
-impl ArgsLike for ArgsDesc {
-	fn unnamed_len(&self) -> usize {
-		self.unnamed.len()
-	}
-
-	fn unnamed_iter(
-		&self,
-		ctx: Context,
-		tailstrict: bool,
-		handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,
-	) -> Result<()> {
-		for (id, arg) in self.unnamed.iter().enumerate() {
-			handler(
-				id,
-				if tailstrict {
-					Thunk::evaluated(evaluate(ctx.clone(), arg)?)
-				} else {
-					let ctx = ctx.clone();
-					let arg = arg.clone();
-
-					Thunk!(move || evaluate(ctx, &arg))
-				},
-			)?;
-		}
-		Ok(())
-	}
-
-	fn named_iter(
-		&self,
-		ctx: Context,
-		tailstrict: bool,
-		handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,
-	) -> Result<()> {
-		for (name, arg) in &self.named {
-			handler(
-				name,
-				if tailstrict {
-					Thunk::evaluated(evaluate(ctx.clone(), arg)?)
-				} else {
-					let ctx = ctx.clone();
-					let arg = arg.clone();
-
-					Thunk!(move || evaluate(ctx, &arg))
-				},
-			)?;
-		}
-		Ok(())
-	}
-
-	fn named_names(&self, handler: &mut dyn FnMut(&IStr)) {
-		for (name, _) in &self.named {
-			handler(name);
-		}
-	}
-
-	fn is_empty(&self) -> bool {
-		self.unnamed.is_empty() && self.named.is_empty()
-	}
-}
modifiedcrates/jrsonnet-evaluator/src/function/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/mod.rs
+++ b/crates/jrsonnet-evaluator/src/function/mod.rs
@@ -1,11 +1,10 @@
 use std::{fmt::Debug, rc::Rc};
 
-pub use arglike::{ArgLike, ArgsLike, TlaArg};
 use educe::Educe;
 use jrsonnet_gcmodule::{Cc, Trace};
 use jrsonnet_interner::IStr;
 pub use jrsonnet_macros::builtin;
-use jrsonnet_parser::{Destruct, Expr, ExprParams, Span, Spanned};
+use jrsonnet_parser::{ArgsDesc, Destruct, Expr, ExprParams, Span, Spanned};
 
 use self::{
 	builtin::{Builtin, StaticBuiltin},
@@ -17,12 +16,12 @@
 	Result, Thunk, Val,
 };
 
-pub mod arglike;
 pub mod builtin;
-pub mod native;
-pub mod parse;
+mod native;
+mod parse;
 mod prepared;
 
+pub use native::NativeFn;
 pub use prepared::PreparedFuncVal;
 
 pub use jrsonnet_parser::function::*;
@@ -81,10 +80,10 @@
 	}
 
 	/// Create context, with which body code will run
-	pub fn call_body_context(
+	pub(crate) fn call_body_context(
 		&self,
 		call_ctx: Context,
-		args: &dyn ArgsLike,
+		args: &ArgsDesc,
 		tailstrict: bool,
 	) -> Result<Context> {
 		parse_function_call(call_ctx, self.ctx.clone(), &self.params, args, tailstrict)
@@ -170,7 +169,7 @@
 		&self,
 		call_ctx: Context,
 		loc: CallLocation<'_>,
-		args: &dyn ArgsLike,
+		args: &ArgsDesc,
 		tailstrict: bool,
 	) -> Result<Val> {
 		match self {
@@ -179,7 +178,7 @@
 				evaluate(body_ctx, &func.body)
 			}
 			Self::Thunk(thunk) => {
-				if !args.is_empty() {
+				if !args.named.is_empty() || !args.unnamed.is_empty() {
 					bail!(TooManyArgsFunctionHas(0, FunctionSignature::empty()))
 				}
 				thunk.evaluate()
modifiedcrates/jrsonnet-evaluator/src/function/native.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/native.rs
+++ b/crates/jrsonnet-evaluator/src/function/native.rs
@@ -1,2 +1,68 @@
+use std::marker::PhantomData;
+
+use jrsonnet_gcmodule::Trace;
+
 use super::PreparedFuncVal;
-use crate::{typed::Typed, CallLocation, Result, Thunk};
+use crate::{bail, function::FuncVal, typed::Typed, CallLocation, Result, Val};
+use jrsonnet_types::{ComplexValType, ValType};
+
+#[derive(Debug, Trace, Clone)]
+pub struct NativeFn<D: 'static>(pub(crate) PreparedFuncVal, PhantomData<D>);
+macro_rules! impl_native_desc {
+	($i:expr; $($gen:ident)*) => {
+		impl<$($gen,)* O> NativeFn<($($gen,)* O,)>
+		where
+			$($gen: Typed,)*
+			O: Typed,
+		{
+			#[allow(non_snake_case, clippy::too_many_arguments)]
+			pub fn call(
+				&self,
+				$($gen: $gen,)*
+			) -> Result<O> {
+				let val = self.0.call(
+					CallLocation::native(),
+					&[$(Typed::into_lazy_untyped($gen),)*],
+					&[],
+				)?;
+				O::from_untyped(val)
+			}
+		}
+		impl<$($gen,)* O> Typed for NativeFn<($($gen,)* O,)> {
+			const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);
+
+			fn into_untyped(_typed: Self) -> Result<Val> {
+				bail!("can only convert functions from jsonnet to native")
+			}
+
+			fn from_untyped(untyped: Val) -> Result<Self> {
+				let func = FuncVal::from_untyped(untyped)?;
+				Ok(Self(
+					PreparedFuncVal::new(func, $i, &[])?,
+					PhantomData,
+				))
+			}
+		}
+	};
+	($i:expr; $($cur:ident)* @ $c:ident $($rest:ident)*) => {
+		impl_native_desc!($i; $($cur)*);
+		impl_native_desc!($i + 1; $($cur)* $c @ $($rest)*);
+	};
+	($i:expr; $($cur:ident)* @) => {
+		impl_native_desc!($i; $($cur)*);
+	}
+}
+
+impl_native_desc! {
+	0; @ A B C D E F G H I J K L
+}
+
+mod native_macro {
+	#[macro_export]
+	macro_rules! NativeFn {
+		(($($t:ty),* $(,)?) -> $res:ty) => {
+			NativeFn<($($t,)* $res)>
+		}
+	}
+}
+pub use crate::NativeFn;
modifiedcrates/jrsonnet-evaluator/src/function/parse.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/parse.rs
+++ b/crates/jrsonnet-evaluator/src/function/parse.rs
@@ -1,19 +1,29 @@
+use std::rc::Rc;
+
 use jrsonnet_parser::{
 	function::{FunctionSignature, ParamName},
-	ExprParams,
+	ArgsDesc, Expr, ExprParams, Spanned,
 };
 use rustc_hash::FxHashMap;
 
-use super::arglike::ArgsLike;
 use crate::{
 	bail,
 	destructure::destruct,
 	error::{ErrorKind::*, Result},
-	evaluate_named_param,
+	evaluate, evaluate_named_param,
 	gc::WithCapacityExt as _,
 	Context, Pending, Thunk, Val,
 };
 
+fn eval_arg(ctx: Context, arg: &Rc<Spanned<Expr>>, tailstrict: bool) -> Result<Thunk<Val>> {
+	if tailstrict {
+		Ok(Thunk::evaluated(evaluate(ctx, arg)?))
+	} else {
+		let arg = arg.clone();
+		Ok(Thunk!(move || evaluate(ctx, &arg)))
+	}
+}
+
 /// Creates correct [context](Context) for function body evaluation returning error on invalid call.
 ///
 /// ## Parameters
@@ -22,15 +32,15 @@
 /// * `params`: function parameters' definition
 /// * `args`: passed function arguments
 /// * `tailstrict`: if set to `true` function arguments are eagerly executed, otherwise - lazily
-pub fn parse_function_call(
+pub(crate) fn parse_function_call(
 	ctx: Context,
 	body_ctx: Context,
 	params: &ExprParams,
-	args: &dyn ArgsLike,
+	args: &ArgsDesc,
 	tailstrict: bool,
 ) -> Result<Context> {
 	let mut passed_args = FxHashMap::with_capacity(params.binds_len());
-	if args.unnamed_len() > params.signature.len() {
+	if args.unnamed.len() > params.signature.len() {
 		bail!(TooManyArgsFunctionHas(
 			params.signature.len(),
 			params.signature.clone(),
@@ -40,28 +50,29 @@
 	let mut filled_named = 0;
 	let mut filled_positionals = 0;
 
-	args.unnamed_iter(ctx.clone(), tailstrict, &mut |id, arg| {
+	for (id, arg) in args.unnamed.iter().enumerate() {
 		destruct(
 			&params.exprs[id].destruct,
-			arg,
+			eval_arg(ctx.clone(), arg, tailstrict)?,
 			Pending::new_filled(ctx.clone()),
 			&mut passed_args,
 		)?;
 		filled_positionals += 1;
-		Ok(())
-	})?;
+	}
 
-	args.named_iter(ctx, tailstrict, &mut |name, value| {
+	for (name, value) in &args.named {
 		// FIXME: O(n) for arg existence check
 		if !params.exprs.iter().any(|p| &p.destruct.name() == name) {
 			bail!(UnknownFunctionParameter(name.clone()));
 		}
-		if passed_args.insert(name.clone(), value).is_some() {
+		if passed_args
+			.insert(name.clone(), eval_arg(ctx.clone(), value, tailstrict)?)
+			.is_some()
+		{
 			bail!(BindingParameterASecondTime(name.clone()));
 		}
 		filled_named += 1;
-		Ok(())
-	})?;
+	}
 
 	if filled_named + filled_positionals < params.len() {
 		// Some args are unset, but maybe we have defaults for them
@@ -104,13 +115,13 @@
 
 		// Some args still weren't filled
 		if filled_named + filled_positionals != params.len() {
-			for param in params.exprs.iter().skip(args.unnamed_len()) {
+			for param in params.exprs.iter().skip(args.unnamed.len()) {
 				let mut found = false;
-				args.named_names(&mut |name| {
+				for (name, _) in &args.named {
 					if &param.destruct.name() == name {
 						found = true;
 					}
-				});
+				}
 				if !found {
 					bail!(FunctionParameterNotBoundInCall(
 						param.destruct.name(),
@@ -141,34 +152,35 @@
 pub fn parse_builtin_call(
 	ctx: Context,
 	params: FunctionSignature,
-	args: &dyn ArgsLike,
+	args: &ArgsDesc,
 	tailstrict: bool,
 ) -> Result<Vec<Option<Thunk<Val>>>> {
 	let mut passed_args: Vec<Option<Thunk<Val>>> = vec![None; params.len()];
-	if args.unnamed_len() > params.len() {
+	if args.unnamed.len() > params.len() {
 		bail!(TooManyArgsFunctionHas(params.len(), params,))
 	}
 
 	let mut filled_args = 0;
 
-	args.unnamed_iter(ctx.clone(), tailstrict, &mut |id, arg| {
-		passed_args[id] = Some(arg);
+	for (id, arg) in args.unnamed.iter().enumerate() {
+		passed_args[id] = Some(eval_arg(ctx.clone(), arg, tailstrict)?);
 		filled_args += 1;
-		Ok(())
-	})?;
+	}
 
-	args.named_iter(ctx, tailstrict, &mut |name, arg| {
+	for (name, arg) in &args.named {
 		// FIXME: O(n) for arg existence check
 		let id = params
 			.iter()
 			.position(|p| p.name() == name)
 			.ok_or_else(|| UnknownFunctionParameter(name.clone()))?;
-		if passed_args[id].replace(arg).is_some() {
+		if passed_args[id]
+			.replace(eval_arg(ctx.clone(), arg, tailstrict)?)
+			.is_some()
+		{
 			bail!(BindingParameterASecondTime(name.clone()));
 		}
 		filled_args += 1;
-		Ok(())
-	})?;
+	}
 
 	if filled_args < params.len() {
 		for (id, _) in params.iter().enumerate().filter(|(_, p)| p.has_default()) {
@@ -180,13 +192,13 @@
 
 		// Some args still wasn't filled
 		if filled_args != params.len() {
-			for param in params.iter().skip(args.unnamed_len()) {
+			for param in params.iter().skip(args.unnamed.len()) {
 				let mut found = false;
-				args.named_names(&mut |name| {
+				for (name, _) in &args.named {
 					if param.name() == name {
 						found = true;
 					}
-				});
+				}
 				if !found {
 					bail!(FunctionParameterNotBoundInCall(
 						param.name().clone(),
modifiedcrates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -19,7 +19,7 @@
 mod obj;
 pub mod stack;
 pub mod stdlib;
-mod tla;
+pub mod tla;
 pub mod trace;
 pub mod typed;
 pub mod val;
modifiedcrates/jrsonnet-evaluator/src/tla.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/tla.rs
+++ b/crates/jrsonnet-evaluator/src/tla.rs
@@ -1,12 +1,68 @@
 use std::{collections::HashMap, hash::BuildHasher};
 
+use jrsonnet_gcmodule::Trace;
 use jrsonnet_interner::IStr;
+use jrsonnet_parser::{SourceFifo, SourcePath};
 
 use crate::{
-	function::{CallLocation, PreparedFuncVal, TlaArg},
-	in_description_frame, Result, Val,
+	function::{CallLocation, PreparedFuncVal},
+	in_description_frame, with_state, Result, Thunk, Val,
 };
 
+#[derive(Clone, Trace)]
+pub enum TlaArg {
+	String(IStr),
+	Val(Val),
+	Lazy(Thunk<Val>),
+	Import(String),
+	ImportStr(String),
+	InlineCode(String),
+}
+impl TlaArg {
+	pub fn evaluate_tailstrict(&self) -> Result<Val> {
+		match self {
+			Self::String(s) => Ok(Val::string(s.clone())),
+			Self::Val(val) => Ok(val.clone()),
+			Self::Lazy(lazy) => Ok(lazy.evaluate()?),
+			Self::Import(p) => with_state(|s| {
+				let resolved = s.resolve_from_default(&p.as_str())?;
+				s.import_resolved(resolved)
+			}),
+			Self::ImportStr(p) => with_state(|s| {
+				let resolved = s.resolve_from_default(&p.as_str())?;
+				s.import_resolved_str(resolved).map(Val::string)
+			}),
+			Self::InlineCode(p) => with_state(|s| {
+				let resolved =
+					SourcePath::new(SourceFifo("<inline code>".to_owned(), p.as_bytes().into()));
+				s.import_resolved(resolved)
+			}),
+		}
+	}
+	pub fn evaluate(&self) -> Result<Thunk<Val>> {
+		match self {
+			Self::String(s) => Ok(Thunk::evaluated(Val::string(s.clone()))),
+			Self::Val(val) => Ok(Thunk::evaluated(val.clone())),
+			Self::Lazy(lazy) => Ok(lazy.clone()),
+			Self::Import(p) => with_state(|s| {
+				let resolved = s.resolve_from_default(&p.as_str())?;
+				Ok(Thunk!(move || s.import_resolved(resolved)))
+			}),
+			Self::ImportStr(p) => with_state(|s| {
+				let resolved = s.resolve_from_default(&p.as_str())?;
+				Ok(Thunk!(move || s
+					.import_resolved_str(resolved)
+					.map(Val::string)))
+			}),
+			Self::InlineCode(p) => with_state(|s| {
+				let resolved =
+					SourcePath::new(SourceFifo("<inline code>".to_owned(), p.as_bytes().into()));
+				Ok(Thunk!(move || s.import_resolved(resolved)))
+			}),
+		}
+	}
+}
+
 pub fn apply_tla<H: BuildHasher>(args: &HashMap<IStr, TlaArg, H>, val: Val) -> Result<Val> {
 	Ok(if let Val::Func(func) = val {
 		in_description_frame(
modifiedcrates/jrsonnet-evaluator/src/typed/conversions.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/typed/conversions.rs
+++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs
@@ -8,7 +8,7 @@
 use crate::{
 	arr::{ArrValue, BytesArray},
 	bail,
-	function::{CallLocation, FuncDesc, FuncVal, PreparedFuncVal},
+	function::{FuncDesc, FuncVal},
 	typed::CheckType,
 	val::{IndexableVal, NumValue, StrValue, ThunkMapper},
 	ObjValue, ObjValueBuilder, Result, ResultExt, Thunk, Val,
@@ -671,69 +671,9 @@
 			Ok(None)
 		} else {
 			T::from_untyped(untyped).map(Some)
-		}
-	}
-}
-
-#[derive(Debug, Trace, Clone)]
-pub struct NativeFn<D: 'static>(pub(crate) PreparedFuncVal, PhantomData<D>);
-macro_rules! impl_native_desc {
-	($i:expr; $($gen:ident)*) => {
-		impl<$($gen,)* O> NativeFn<($($gen,)* O,)>
-		where
-			$($gen: Typed,)*
-			O: Typed,
-		{
-			pub fn call(
-				&self,
-				$($gen: $gen,)*
-			) -> Result<O> {
-				let val = self.0.call(
-					CallLocation::native(),
-					&[$(Typed::into_lazy_untyped($gen),)*],
-					&[],
-				)?;
-				O::from_untyped(val)
-			}
-		}
-		impl<$($gen,)* O> Typed for NativeFn<($($gen,)* O,)> {
-			const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);
-
-			fn into_untyped(_typed: Self) -> Result<Val> {
-				bail!("can only convert functions from jsonnet to native")
-			}
-
-			fn from_untyped(untyped: Val) -> Result<Self> {
-				let func = FuncVal::from_untyped(untyped)?;
-				Ok(Self(
-					PreparedFuncVal::new(func, $i, &[])?,
-					PhantomData,
-				))
-			}
 		}
-	};
-	($i:expr; $($cur:ident)* @ $c:ident $($rest:ident)*) => {
-		impl_native_desc!($i; $($cur)*);
-		impl_native_desc!($i + 1; $($cur)* $c @ $($rest)*);
-	};
-	($i:expr; $($cur:ident)* @) => {
-		impl_native_desc!($i; $($cur)*);
 	}
-}
-
-impl_native_desc! {
-	0; @ A B C D E F G H I J K L
 }
-
-mod native_macro {
-	#[macro_export]
-	macro_rules! NativeFn {
-		(($($t:ty),* $(,)?) -> $res:ty) => {
-			NativeFn<($($t,)* $res)>
-		}
-	}
-}
-pub use crate::NativeFn;
 
 impl Typed for NumValue {
 	const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Num);
modifiedcrates/jrsonnet-macros/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-macros/src/lib.rs
+++ b/crates/jrsonnet-macros/src/lib.rs
@@ -405,7 +405,7 @@
 		const _: () = {
 			use ::jrsonnet_evaluator::{
 				State, Val,
-				function::{builtin::{Builtin, StaticBuiltin}, FunctionSignature, ParamParse, ParamName, ParamDefault, CallLocation, ArgsLike, parse::parse_builtin_call},
+				function::{builtin::{Builtin, StaticBuiltin}, FunctionSignature, ParamParse, ParamName, ParamDefault, CallLocation},
 				Result, Context, typed::Typed,
 				parser::Span, params, Thunk,
 			};
modifiedcrates/jrsonnet-stdlib/src/arrays.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -2,9 +2,9 @@
 
 use jrsonnet_evaluator::{
 	bail,
-	function::{builtin, FuncVal},
+	function::{builtin, FuncVal, NativeFn},
 	runtime_error,
-	typed::{BoundedI32, BoundedUsize, Either2, NativeFn, Typed},
+	typed::{BoundedI32, BoundedUsize, Either2, Typed},
 	val::{equals, ArrValue, IndexableVal},
 	Either, IStr, ObjValue, ObjValueBuilder, Result, ResultExt, Thunk, Val,
 };
modifiedcrates/jrsonnet-stdlib/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -13,7 +13,8 @@
 pub use hash::*;
 use jrsonnet_evaluator::{
 	error::Result,
-	function::{CallLocation, FuncVal, TlaArg},
+	function::{CallLocation, FuncVal},
+	tla::TlaArg,
 	trace::PathResolver,
 	val::NumValue,
 	ContextBuilder, IStr, ObjValue, ObjValueBuilder, Thunk, Val,
modifiedtests/tests/cpp_test_suite.rsdiffbeforeafterboth
--- a/tests/tests/cpp_test_suite.rs
+++ b/tests/tests/cpp_test_suite.rs
@@ -6,10 +6,10 @@
 
 use jrsonnet_evaluator::{
 	FileImportResolver, IStr, ObjValueBuilder, State, Val, apply_tla,
-	function::TlaArg,
 	gc::WithCapacityExt as _,
 	manifest::JsonFormat,
 	rustc_hash::FxHashMap,
+	tla::TlaArg,
 	trace::{CompactFormat, PathResolver, TraceFormat},
 };
 use jrsonnet_stdlib::ContextInitializer;