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

fix some things in ffi.pl

Browse Source 
thanks triska for pointing out most of these
This commit is contained in:
Skgland
2025-08-09 18:35:25 +02:00
committed by Bennet Bleßmann
parent 3a4dfc46da
commit 4b5e4a2745
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/ffi.pl
View File

@@ -52,6 +52,8 @@ And a new window should pop up!
:- use_module(library(lists)). :- use_module(library(lists)).
:- use_module(library(error)). :- use_module(library(error)).
:- use_module(library(format)).
:- use_module(library(dcgs)).
%% foreign_struct(+Name, +Elements). %% foreign_struct(+Name, +Elements).
% %
@@ -130,11 +132,11 @@ deallocate(Allocator, Type, Ptr) :-
:- dynamic(is_array_type_defined/1). :- dynamic(is_array_type_defined/1).
array_type(ElemType, Len, ArrayType) :- array_type(ElemType, Len, ArrayType) :-
phrase(format("$[~a;~d]", [ElemType, Len]), ArrayTypeName), phrase(format_("$[~a;~d]", [ElemType, Len]), ArrayTypeName),
atom_chars(ArrayType, ArrayTypeName), atom_chars(ArrayType, ArrayTypeName),
(is_array_type_defined(ArrayType) -> true (is_array_type_defined(ArrayType) -> true
; length(Fields, Len), ; length(Fields, Len),
maplist('='(ElemType), Fields), maplist(=(ElemType), Fields),
foreign_struct(ArrayType, Fields), foreign_struct(ArrayType, Fields),
assertz(is_array_type_defined(ArrayType)) assertz(is_array_type_defined(ArrayType))
). ).
@@ -142,10 +144,9 @@ array_type(ElemType, Len, ArrayType) :-
with_locals(Locals, Goal) :- with_locals(Locals, Goal) :-
verify_locals(Locals), verify_locals(Locals),
allocate_locals(Locals), allocate_locals(Locals),
( catch(Goal, E, (deallocate(Locals), throw(E), false)) -> Success = true ( catch(Goal, E, (deallocate(Locals), throw(E))) -> deallocate_locals(Locals)
; Success = false ; deallocate_locals(Locals), false
), ).
deallocate_locals(Locals).
verify_locals(Locals) :- verify_locals(Locals) :-
must_be(list, Locals), must_be(list, Locals),
@@ -162,7 +163,7 @@ allocate_locals([]).
allocate_locals([let(Var, Type, Init) | Ls]) :- allocate_locals([let(Var, Type, Init) | Ls]) :-
allocate(rust, Type, Init , Var), allocate(rust, Type, Init , Var),
(catch(allocate_locals(Ls), E, (deallocate_locals([let(Var, Type, Init)]), throw(E))) -> true (catch(allocate_locals(Ls), E, (deallocate_locals([let(Var, Type, Init)]), throw(E))) -> true
; deallocate_locals(let(Var, Type, Init)), false ; deallocate_locals([let(Var, Type, Init)]), false
). ).
deallocate_locals([]). deallocate_locals([]).