Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix doc ref in CHANGES and use better wording. #1536

Merged
merged 2 commits into from
Jun 28, 2023
Merged

Fix doc ref in CHANGES and use better wording. #1536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a51c7ec
Fix doc ref in CHANGES and use better wording.
kquick Jun 27, 2023
b1910c8
Fix some syntax errors in the Modules documentation.
kquick Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@

* Declarations may now use *numeric constraint guards*. This is a feature
that allows a function to behave differently depending on its numeric
type parameters. See the [manual section](https://galoisinc.github.io/cryptol/master/BasicSyntax.html#numeric-constraint-guards))
type parameters. See this [manual section](https://galoisinc.github.io/cryptol/master/BasicSyntax.html#numeric-constraint-guards)
for more information.

* The foreign function interface (FFI) has been added, which allows Cryptol to
call functions written in C. See the [manual section](https://galoisinc.github.io/cryptol/master/FFI.html)
call functions written in C. See this [manual section](https://galoisinc.github.io/cryptol/master/FFI.html)
for more information.

* The unary `-` operator now has the same precedence as binary `-`, meaning
Expand Down
6 changes: 3 additions & 3 deletions docs/RefMan/Modules.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ Module may be declared within other modules, using the ``submodule`` keword.
Submodules may refer to names in their enclosing scope.
Declarations in a sub-module will shadow names in the outer scope.

Declarations in a submdule may be imported with ``import submodule``,
Declarations in a submodule may be imported with ``import submodule``,
which works just like an ordinary import except that ``X`` refers
to the name of a submodule.

Expand Down Expand Up @@ -300,7 +300,7 @@ each locally defined submodules.
z = 2 * N::y

``N::y`` works in the previous example because Cryptol added
an implicit import ``import submoulde N as N``.
an implicit import ``import submodule N as N``.


Managing Module Names
Expand All @@ -313,7 +313,7 @@ containing module, and must be imported before they can be used.
Thus, to use a submodule defined in top-level module ``A`` into
another top-level module ``B`` requires two steps:

1. First we need to import ``A`` to bring the name of the submodule in scope
1. First we need to import ``A`` to bring the name of the submodule in scope,
2. Then we need to import the submodule to bring the names defined in it in scope.

.. code-block:: cryptol
Expand Down