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

Fill more cases

Browse Source
This commit is contained in:
Adrián Arroyo Calle
2023-03-01 22:10:26 +01:00
parent 7396630627
commit 73df96244d
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ffi.rs
View File

@@ -306,6 +306,7 @@ impl ForeignFunctionTable {
Ok(Value::Int(i64::try_from(*n).map_err(|_| FFIError::ValueDontFit)?)) Ok(Value::Int(i64::try_from(*n).map_err(|_| FFIError::ValueDontFit)?))
}, },
libffi::raw::FFI_TYPE_SINT64 => call_and_return!(i64), libffi::raw::FFI_TYPE_SINT64 => call_and_return!(i64),
libffi::raw::FFI_TYPE_POINTER => call_and_return!(*mut c_void),
libffi::raw::FFI_TYPE_FLOAT => { libffi::raw::FFI_TYPE_FLOAT => {
let mut n: Box<f32> = Box::new(0.0); let mut n: Box<f32> = Box::new(0.0);
libffi::raw::ffi_call( libffi::raw::ffi_call(
@@ -380,6 +381,7 @@ impl ForeignFunctionTable {
field_ptr = field_ptr.add(std::mem::size_of::<u64>()); field_ptr = field_ptr.add(std::mem::size_of::<u64>());
}, },
libffi::raw::FFI_TYPE_SINT64 => read_and_push_int!(i64), libffi::raw::FFI_TYPE_SINT64 => read_and_push_int!(i64),
libffi::raw::FFI_TYPE_POINTER => read_and_push_int!(i64),
libffi::raw::FFI_TYPE_STRUCT => { libffi::raw::FFI_TYPE_STRUCT => {
let substruct = struct_type.atom_fields[i].as_str(); let substruct = struct_type.atom_fields[i].as_str();
let struct_type = self.structs.get(substruct).ok_or(FFIError::StructNotFound)?; let struct_type = self.structs.get(substruct).ok_or(FFIError::StructNotFound)?;

17
src/machine/system_calls.rs
View File

@@ -4310,12 +4310,17 @@ impl Machine {
Ok(result) => { Ok(result) => {
match result { match result {
Value::Int(n) => self.machine_st.unify_fixnum(Fixnum::build_with(n), return_value), Value::Int(n) => self.machine_st.unify_fixnum(Fixnum::build_with(n), return_value),
Value::Float(n) => {
let n = float_alloc!(n, self.machine_st.arena);
self.machine_st.unify_f64(n, return_value)
},
Value::Struct(name, args) => { Value::Struct(name, args) => {
let struct_value = self.build_struct(&name, args); let struct_value = self.build_struct(&name, args);
unify!(self.machine_st, return_value, struct_value); unify!(self.machine_st, return_value, struct_value);
} }
_ => { Value::CString(cstr) => {
unreachable!(); let cstr = self.machine_st.atom_tbl.build_with(cstr.to_str().unwrap());
self.machine_st.unify_complete_string(cstr, return_value);
} }
} }
return Ok(()); return Ok(());
@@ -4340,10 +4345,10 @@ impl Machine {
let cells: Vec<_> = args.into_iter() let cells: Vec<_> = args.into_iter()
.map(|val| { .map(|val| {
match val { match val {
Value::Int(n) => fixnum_as_cell!(Fixnum::build_with(n)), Value::Int(n) => fixnum_as_cell!(Fixnum::build_with(n)),
Value::CString(cstr) => atom_as_cell!(self.machine_st.atom_tbl.build_with(&cstr.into_string().unwrap())), Value::Float(n) => HeapCellValue::from(float_alloc!(n, self.machine_st.arena)),
Value::Struct(name, struct_args) => self.build_struct(&name, struct_args), Value::CString(cstr) => atom_as_cell!(self.machine_st.atom_tbl.build_with(&cstr.into_string().unwrap())),
_ => unreachable!() Value::Struct(name, struct_args) => self.build_struct(&name, struct_args),
} }
}).collect(); }).collect();