Skip to content

Commit f2fdf4d

Browse files
committed
Auto merge of #704 - spastorino:small-fixes-on-engine, r=jackh726
Small fixes on engine r? `@jackh726`
2 parents 74ec03b + d64bbef commit f2fdf4d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

book/src/engine/logic.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ something to be unsolvable), the solving is restarted at the root `Goal`.
2323
In order to detect cycles (talked more about later), as well as keep track of
2424
the selected [`Strand`] for each table, `chalk-engine` stores a [`Stack`] on the
2525
`Forest`. Whenever a new goal is selected, a [`StackEntry`] is pushed onto the
26-
`Stack`, as well as the the "time" (which also gets incremented) that it was
27-
pushed. This "time" can be compared later to check if all the `Strands` of a
28-
[`Table`] have been checked in a single solve.
26+
`Stack`, as well as the "time" (which also gets incremented) that it was pushed.
27+
This "time" can be compared later to check if all the `Strands` of a [`Table`]
28+
have been checked in a single solve.
2929

3030
As either `Answer`s are found for the selected `Table`, entries on the stack are
3131
`pop`ed. If something is found to be unsolvable, the complete stack is unwound.
@@ -34,7 +34,7 @@ As either `Answer`s are found for the selected `Table`, entries on the stack are
3434

3535
As mentioned before, whenever a new `Goal` is encountered, a new [`Table`] is
3636
created to store current and future answers. First, the [`Goal`] is converted into
37-
an `HhGoal`. If it can be simplified, then a `Strand` with one or more
37+
an `GoalData`. If it can be simplified, then a `Strand` with one or more
3838
subgoals will be generated and can be followed as above. Otherwise, if it is a
3939
`DomainGoal` (see above), then
4040
[`program_clauses_for_goal`](https://rust-lang.github.io/chalk/chalk_solve/clauses/fn.program_clauses_for_goal.html)

book/src/engine/major_concepts.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ logic.
77
## Goals
88

99
A "goal" in Chalk can be thought of as "something we want to prove". The engine
10-
itself understands `HhGoal`s. `HHGoal`s consist of the most basic logic,
10+
itself understands `GoalData`s. `GoalData`s consist of the most basic logic,
1111
such as introducing Binders (`Forall` or `Exists`) or combining goals (`All`).
1212
On the other hand, `Goal` represents an opaque goal generated
1313
externally. As such, it may contain any extra information or may be interned.
1414
When solving a logic predicate, Chalk will lazily convert `Goal`s
15-
into `HHGoal`s.
15+
into `GoalData`s.
1616

17-
There are three types of completely opaque `HhGoal`s that Chalk can solve:
17+
There are three types of completely opaque `GoalData`s that Chalk can solve:
1818
`Unify`, `DomainGoal`, and `CannotProve`. Unlike the other types of goals,
1919
these three cannot be simplified any further. `Unify` is the goal of unifying
2020
any two types. `DomainGoal` is any goal that can solve by applying a

0 commit comments

Comments
 (0)