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

correct bugs in verify_attributes handling

Browse Source
This commit is contained in:
Mark Thom
2019-02-09 00:16:57 -07:00
parent 661f9b7414
commit 33dbe3bb45
6 changed files with 70 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/prolog/lib/atts.pl
View File

@@ -24,7 +24,7 @@
'$get_from_list'([L|Ls], Attr) :-
nonvar(L),
( L \= Attr -> nonvar(Ls), '$get_from_list'(Ls, Attr)
; copy_term(L, L0), L0 = Attr
; L = Attr
; '$get_from_list'(Ls, Attr)
).

22
src/prolog/lib/dcgs.pl
View File

@@ -56,13 +56,13 @@ expand_body(Term0, ModTerm, N0, N) :-
expand_body_term(Term0, ModTerm, N0, N).
/* unfurl_commas(?ModTerm, -ModTerms, -ModTerms1) :
sets ModTerms = (ModTermI0, ModTermI1, ..., ModTermIN, ModTerms1)
sets ModTerms = (ModTermI0, ModTermI1, ..., ModTermIN, ModTerms1)
where ModTerm = (ModTermI0, ModTermI1, ..., ModTermIN) */
unfurl_commas(ModTerm, ModTerms, ModTerms1) :-
nonvar(ModTerm),
ModTerm = (ModTermI0, ModTermIs),
!,
ModTerms = (ModTermI0, ModTerms2),
ModTerms = (ModTermI0, ModTerms2),
unfurl_commas(ModTermIs, ModTerms2, ModTerms1).
unfurl_commas(ModTermIN, (ModTermIN, ModTerms1), ModTerms1).
@@ -75,8 +75,20 @@ expand_body_term((P -> Q), (PModTerm -> QModTerm), N0, N) :-
!, expand_body(P, PModTerm, N0, N1),
expand_body(Q, QModTerm, N1, N).
expand_body_term((P ; Q), (PModTerm ; QModTerm), N0, N) :-
!, expand_body(P, PModTerm, N0, N),
expand_body(Q, QModTerm, N0, N).
!, expand_body(P, PModTerm0, N0, N1),
expand_body(Q, QModTerm0, N0, N2),
( N1 == N2 -> PModTerm = PModTerm0,
QModTerm = QModTerm0,
N = N1
; N1 < N2 -> unfurl_commas(PModTerm0, PModTerm, Hole),
Hole = ('$VAR'(N1) = '$VAR'(N2) ),
QModTerm = QModTerm0,
N = N2
; N1 > N2 -> unfurl_commas(QModTerm0, QModTerm, Hole),
Hole = ('$VAR'(N1) = '$VAR'(N2) ),
PModTerm = PModTerm0,
N = N1
).
expand_body_term(CommaTerm, ModTerm, N, N) :-
CommaTerm =.. [{} | BodyTerms], !,
comma_ify(BodyTerms, ModTerm).
@@ -88,4 +100,4 @@ expand_body_term(GrammarRule, ModTerm, N0, N) :-
comma_ify([Term], Term) :- !.
comma_ify([Term | Args], (Term, Terms)) :-
comma_ify(Terms, Args).
comma_ify(Args, Terms).