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

correct dcg handling of cuts

Browse Source
This commit is contained in:
Mark Thom
2019-10-04 15:41:48 -06:00
parent d4f9d18149
commit 1569cac98f
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "scryer-prolog" name = "scryer-prolog"
version = "0.8.100" version = "0.8.101"
authors = ["Mark Thom <markjordanthom@gmail.com>"] authors = ["Mark Thom <markjordanthom@gmail.com>"]
build = "build.rs" build = "build.rs"
repository = "https://github.com/mthom/scryer-prolog" repository = "https://github.com/mthom/scryer-prolog"

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

@@ -100,6 +100,7 @@ expand_body_term((P ; Q), (PModTerm ; QModTerm), N0, N) :-
PModTerm = PModTerm0, PModTerm = PModTerm0,
N = N1 N = N1
). ).
expand_body_term(!, !, N, N) :- !.
expand_body_term(CommaTerm, ModTerm, N, N) :- expand_body_term(CommaTerm, ModTerm, N, N) :-
CommaTerm =.. [{} | BodyTerms], !, CommaTerm =.. [{} | BodyTerms], !,
comma_ify(BodyTerms, ModTerm). comma_ify(BodyTerms, ModTerm).

5
src/prolog/lib/freeze.pl
View File

@@ -22,10 +22,11 @@ freeze(X, Goal) :-
Fresh = X. Fresh = X.
gather_freeze_goals(Attrs, _) --> gather_freeze_goals(Attrs, _) -->
{ var(Attrs), ! }. { var(Attrs) },
!.
gather_freeze_goals([frozen(X) | _], Var) --> gather_freeze_goals([frozen(X) | _], Var) -->
[freeze(Var, X)], [freeze(Var, X)],
{ ! }. !.
gather_freeze_goals([_ | Attrs], Var) --> gather_freeze_goals([_ | Attrs], Var) -->
gather_freeze_goals(Attrs, Var). gather_freeze_goals(Attrs, Var).