rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't crash on empty list and differentiate list head not being string like

Browse Source
This commit is contained in:
Skgland
2025-08-11 23:20:48 +02:00
committed by Bennet Bleßmann
parent cd777294b9
commit f4297e365f
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/machine/system_calls.rs
View File

@@ -5018,15 +5018,21 @@ impl Machine {
// the tail are the struct field values // the tail are the struct field values
let mut iter = args.into_iter(); let mut iter = args.into_iter();
if let Some(struct_name) = machine_st.value_to_str_like(iter.next().unwrap()) {
Ok(Value::Struct( if let Some(head) = iter.next() {
struct_name.as_str().to_string(), if let Some(struct_name) = machine_st.value_to_str_like(head) {
iter.map(|x| Self::map_ffi_arg(machine_st, x, stub_gen)) Ok(Value::Struct(
.collect::<Result<_, _>>()?, struct_name.as_str().to_string(),
)) iter.map(|x| Self::map_ffi_arg(machine_st, x, stub_gen))
.collect::<Result<_, _>>()?,
))
} else {
// first element of a struct needs to be the type
Err(machine_st.error_form(machine_st.ffi_error(FfiError::ValueOutOfRange, head), stub_gen()))
}
} else { } else {
// empty list is an invalid struct repr // empty list is an invalid struct repr
Err(machine_st.error_form(machine_st.ffi_error(FfiError::InvalidStruct, source), stub_gen())) Err(machine_st.error_form(machine_st.ffi_error(FfiError::ValueOutOfRange, source), stub_gen()))
} }
} else { } else {
Err(machine_st.error_form(machine_st.ffi_error(FfiError::InvalidArgument, source), stub_gen())) Err(machine_st.error_form(machine_st.ffi_error(FfiError::InvalidArgument, source), stub_gen()))